Merge "Dismiss SIM PIN screen when eSIM disabled" into sc-dev am: 03b95c36a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15348037

Change-Id: I52c48394ddd4f985db705c42d2149e39e73959e2