Merge "CameraService: hold onto SensorPrivacyManager" am: 733c728752

Change-Id: Ibdf8f29d1ede305d4fc7f7b18ee5f37c25a85162