[automerger skipped] [DO NOT MERGE] Prevent hotseat touch hijack am: acf0a5da0b -s ours am: 33dbf83f16 am: 841e8f2adf am: b040757e5b am: 39679d42f5

Change-Id: I1222cd72be8dc51af48361a4a9e28b9ad169b88b