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

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



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