[automerger] Merge "DO NOT MERGE Add test to prevent touch location leakage." into mnc-dev am: 17cd03d8c2 am: 19a428ead3 am: e7790b6e8c skipped: 7c0cbc5548 am: 4d9e938869

Change-Id: I7316a9197c68b2e959bfff3d3f49cde9f1f76e60