tree 4ae8f9caf236195350b855d3afcf0989c3c441d2
parent f7f152eaa2b9b9387a3e89f9568e9a8ed82237b9
parent 8dc3be62499d439693e5d7b83509d237a0eac3ae
author Treehugger Robot <treehugger-gerrit@google.com> 1638495441 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638495441 +0000

Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576ba am: 8dc3be6249

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

Change-Id: Ica48fc74b73c4d54f39fff315ecd8ffc03989e9a