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

[automerger skipped] Merge "[DO NOT MERGE] Controls Lockscreen affordance" into sc-dev am: 53cab133 am: 09eb0e57 -s ours am: 0c069e04 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I914efd7b62ef4c6c1e8b38b665fc2d4e363fd9db