[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 am: c52b2367e9 am: db5968f4d7 am: f8e60a5c2e

Change-Id: I3b2eba32920a1b1863a64aa8331d090229bf3a2f