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

am skip reason: subject contains skip directive

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

Change-Id: Icdeceeed4bee459121cf814e8d8e1b9225138bf4