Merge "Fix sensorservice on integer sanitized builds." am: 3aa6c9820b
am: 74bf7329c7

Change-Id: Ie07e1465aa84f4d8256a6feafca9a4a2f17ad20e