Merge "Make sure SIM PIN screen shows" into sc-dev am: c3915dcbe9

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

Change-Id: I5a9e69f43467bfa5ee8382430b13451a33cf5832