Merge "Add uid to sensorservice's dump of active connections"