[automerger skipped] Merge "[DO NOT MERGE] Controls Lockscreen affordance"...

[automerger skipped] Merge "[DO NOT MERGE] Controls Lockscreen affordance" into sc-dev am: 53cab133 -s ours am: 4f4d4b56 -s ours am: cd9e8a7b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I58556bb71d9f8db12ca92814df2797d7a591e2ae