Merge "[MEP] the user can't enable the psim when revmovable esim is enabled"...

Merge "[MEP] the user can't enable the psim when revmovable esim is enabled" into tm-qpr-dev am: 2cd07f51

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



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