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

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

Change-Id: Ia3f20c75ac5a58abcce8382f11585010695a9037