[automerger skipped] Merge "Add DEVICE_LOCK permission to Shell to support ATS...

[automerger skipped] Merge "Add DEVICE_LOCK permission to Shell to support ATS test" am: 00b14576 am: 8dc3be62 am: 37643533 am: 3ad0c6ea -s ours

am skip reason: Merged-In I3fa20b53b929c97a6760d65b432a74c3415d6a08 with SHA-1 a07ccbe6 is already in history

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

Change-Id: I1b60ef45b1ee8ff2bc73bf14b8a865e798bd8854