[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "mpietal_keyguard_priority-sc-dev-sc-v2-dev" into sc-v2-dev-plus-aosp am: 9b3222c4 -s ours

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

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

Change-Id: I51a45c3f99595ca0b5bc76258e427048a5ce171f