[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-mainline-prod am: ac3dbb41 -s ours am: 0280801e -s ours

am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 f8023c98 is already in history

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

Change-Id: Ied851ac63f447e80112b492e9ea915b04c470e2a