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

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

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