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: 86e49f22
Change-Id: Id2ce270c16978b6856598cbc5a2342ca1def27f0