Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
am: a957c56da0

Change-Id: I84627e6f4a5cc8ee0f1950977163a97b32c6954c