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