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

Change-Id: I2930c10685eef466491626e7cfed1fbda8720081