Merge "Merge "Grant shell MANAGE_PROFILE_AND_DEVICE_OWNERS permission" am: 945be590 am: e88250dd am: 639e6eb5"