Merge "Respect deviceId in SensorManager cache." into main