[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev" into sc-qpr1-dev am: 333f01f6 -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: I4700ae4041dffce2e9870dbc1faa7c7227c79067