[automerger] DO NOT MERGE Add test to prevent touch location leakage. am: 53c9354b21 am: 246649ef83 am: 31a9a8b0a2 skipped: fbfd06f433 am: 6ab6fefc2e am: 0554d6119a am: 0cfdddd1b6 am: 6032dfe8b3 skipped: 3c3070c39f

Change-Id: Ifde9f83cc202dafe3fe56d780041948aec174b8b