[automerger skipped] Merge "Hide keyguard when SIM transitions to READY" am:...

[automerger skipped] Merge "Hide keyguard when SIM transitions to READY" am: 0ae1b444 am: a6a39e5e am: d3e76abc -s ours am: c858526c -s ours

am skip reason: Change-Id Ibca04e3d6a61c27d4b40f94a8a6223d9739b15ac with SHA-1 d12075a9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic35c0ad2f5f878e516df95c28ccb1947df0bb302