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

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

Change-Id: I4614fa80d2544ee1ba026ae25fd33d9a738f9857