tree 1be19375ba7b5c413e57cceef8b9bb2bb32003f4
parent 14217fe4a97417395565b7db6cb173731eadeb3a
parent 53cab1331bd791b6e4151d9d2c3fcdaa283c32c5
author TreeHugger Robot <treehugger-gerrit@google.com> 1627484397 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627484397 +0000

[automerger skipped] Merge "[DO NOT MERGE] Controls Lockscreen affordance" into sc-dev am: 53cab1331b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icdeceeed4bee459121cf814e8d8e1b9225138bf4