[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into tm-dev am: c4f898fb -s ours am: 15ad68d6 -s ours

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

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

Change-Id: I668d830b857fda250a40d9ad587c5bd0b3d6b5f3