Merge "CameraService: hold onto SensorPrivacyManager"