Merge "DO NOT MERGE Add test to prevent touch location leakage from event metadata." into klp-dev am: 6ca1059674 am: 4ab253297f
am: ca3b24179a  -s ours

Change-Id: I25a76d984f9d61603105673b80061fde0039f707