Merge "Fix sensorservice on integer sanitized builds." am: 3aa6c9820b am: 74bf7329c7
am: c47de6b371  -s ours

Change-Id: I5a55125a6df0b7df5c7664d3aeee56dcb69dd01e