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

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

Change-Id: Id5cd9e762b69b9edc8ea25d7259939a49b3f81b0