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

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

Change-Id: I7ac084116c3230e1ed6f8f2ea141a1de3fa761c3