Merge "Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am: a957c56d am: 49cbe41a" into oc-mr1-dev-plus-aosp