[automerger skipped] Merge "Keyguard: use transition state for syncing occlude...

[automerger skipped] Merge "Keyguard: use transition state for syncing occlude [RESTRICT AUTOMERGE]" into tm-qpr-dev am: 20bcbf38 -s ours am: 3276bd97 -s ours am: b789f3f7 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I1db8304f1d503ed0404abd7b36afe6d4f4d0da74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>