[automerger skipped] [DO NOT MERGE] Prevent hotseat touch hijack am: acf0a5da0b -s ours am: 33dbf83f16 am: d8bee2a541

Change-Id: Ibc4ae865351b2fca53de5ac2c4e369a7782dbea3