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

Change-Id: I4614fa80d2544ee1ba026ae25fd33d9a738f9857