Merge "Fix google-explicit-constructor warnings in sensorservice." am: 215d7ab7d8 am: 341d12b107
am: b6365afdea

Change-Id: I27abfe181b514252dc42341100c1b4e45d04190c