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

Change-Id: I9932c8175ad0e7dd46cfa15fc0c6a037023259b9