Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b9

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



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