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

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



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