[automerger skipped] Merge "[DO NOT MERGE] Controls Lockscreen affordance" into sc-dev am: 53cab1331b am: 2b41cc01dc -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15364077 Change-Id: I0b826ffb33191537c6a5f0dfb052e2d991317dd2
This commit is contained in: