Merge "DO NOT MERGE Add test to prevent touch location leakage." into mnc-dev
am: 17cd03d8c2

Change-Id: I23d223a43ce8979c2714004629d36ce9da4aefcb