tree dbb3ca114dea23323d1b302f3fbe471e4576d10c
parent eaba9530c9017b1f71688c18cde8fcd9eacc3776
parent b040757e5be01324b21dcdd1da69779f875d6e66
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583443829 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583443829 +0000

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

Change-Id: I893f4e1b36ba17089d61364e1afee345cbef4a8e