Merge "Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae...

Merge "Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae am: 40379dd9" into tm-d1-dev-plus-aosp am: 955397f7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967



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