Merge "Add User ID parameter to SensorPrivacyManager API." into sc-dev