[automerger skipped] [DO NOT MERGE] Controls Lockscreen affordance am:...

[automerger skipped] [DO NOT MERGE] Controls Lockscreen affordance am: 9172eef0 am: 2fc17ba9 -s ours am: 0f08fe7c -s ours

am skip reason: subject contains skip directive

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

Change-Id: Idbb00639c767398cbd8fc28ceedbcc79f1745f29