Merge "Add sensorId to biometric sensor proto dumpsys"