[automerger skipped] [DO NOT MERGE] Controls Lockscreen affordance am: 9172eef0 am: de3d65e2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib877c0d075c3b4843add1bd235f9c312f20d1f84