tree dbb3ca114dea23323d1b302f3fbe471e4576d10c
parent dc6e8906163c304ef7ce8fb7956a35cdf56a0097
parent d8bee2a541bc80b23133ee81b4aa30038c4b1dfd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583442614 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583442614 +0000

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

Change-Id: Ibc4ae865351b2fca53de5ac2c4e369a7782dbea3