[automerger skipped] Merge "SystemUI: Reset PUK StateMachine after PUK is...

[automerger skipped] Merge "SystemUI: Reset PUK StateMachine after PUK is unlocked" into rvc-qpr-dev am: 48629095 am: e80a1e22 -s ours

am skip reason: Change-Id I0261d8be913a878e65c5240d4d39b248c2e3a5d5 with SHA-1 8e9417e8 is in history

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

Change-Id: Ifc98898d67a9519b5b1134fc4ed39ebfdb69ab84