[automerger skipped] [DO NOT MERGE] Prevent hotseat touch hijack am: acf0a5da0b -s ours am: 33dbf83f16 am: d8bee2a541 am: 73543addf1 am: e760a49f44 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia91b908c556ff5823a2f7c572f3df1ee94081501