Merge "Add DEVICE_LOCK permission to Shell to support ATS test"