[automerger skipped] [DO NOT MERGE] Controls Lockscreen affordance am: 9172eef0cd am: 2fc17ba995 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15364077 Change-Id: Ic305f93dc5877f81dabda19de01c9fca948f93ba
This commit is contained in: