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

Change-Id: I3f937c658d2b7e99ad08c9254d2e933228234306