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

Change-Id: I3ab5902c2d52dfec8c03c40a0047285a88afc3d1