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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d1357ca43af78e20ce09ce8fbb727cdcd9a5bad