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

Change-Id: Ia762b2bf3e332689a13c083b62b509c6ef9d84dd