Merge "Grant shell MANAGE_PROFILE_AND_DEVICE_OWNERS permission" am: 945be59043

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iea98101145a247adbd33fb88b9579936c1885923