Merge changes from topic "esim_prop" into udc-dev am: 59ca3da8f7 am: 326e6c6b74 am: ff1fe0e9b7 am: fb5ea63c9a

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull-sepolicy/+/23167568

Change-Id: Icef4568ef73334d7c7eab17264daaedc443da341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>