Merge "Grant shell MANAGE_PROFILE_AND_DEVICE_OWNERS permission"