Merge "Add missing sensor types to <android/sensor.h>." am: ced274e88d am: 4dfd5da62d
am: 25889939b1

Change-Id: Ifca5bd7b646a957977cb0a6ef574155df401e24c