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

Change-Id: Ie14c13fada38d8c851668d8a98c957e3f71317b4