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

Change-Id: I0f4f1858236a253fb9f91304eda89f74c789bae8