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

Change-Id: I893f4e1b36ba17089d61364e1afee345cbef4a8e