Merge "SIM PIN unlock - Keyguard in invalid state" into sc-dev am: f9be8149 am: facc7993 am: f5b327d7

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

Change-Id: Ia0ea5ca352e3b279b89c7b7ffd39008eac363521