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: I4b1c66a045d78fc4c2c640d1049d9e9520d686fb