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