Merge "AOD: When prox covered disable touch during pulse instead of aborting"...
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a1
am: 13b17b29
Change-Id: Ib7e303b11b47096daf7216cd6dbd109a047733f9