Merge "Grant shell MANAGE_PROFILE_AND_DEVICE_OWNERS permission" am: 945be59043 am: e88250ddfa am: 639e6eb5cf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11214c97d046087e37129585f71d147e41a7b70e