Merge "CameraService: hold onto SensorPrivacyManager" am: 733c728752 am: 9279fa954a am: 16dd56fa2d

Change-Id: Ibe7d0626f3c93cabc933ae1b8fbc678c3052b19e