Merge "AOD: Use double tap coordinates to trigger Ambient Indication" into oc-dr1-dev
am: 2402522553

Change-Id: I22486ede65b6a07683cea4b8f5c48de94ae7a148