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

Change-Id: I36772d64f0343a8a2155e992a924c89c904acdbe