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

Change-Id: I670928a685a8b3777aa4e193498e1e46acd6ec45