Merge "Add MANAGE_SENSOR_PRIVACY to shell permissions"