Merge "Use explicit user id for setSensorPrivacy" into main