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

Change-Id: Ie526be7c78cff21fe18eb42c7130a9aa68dc961e