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

Change-Id: Id5fea5988c2a3c0be0b87ad0267768bcc2af5ffe