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

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

Change-Id: I3f937c658d2b7e99ad08c9254d2e933228234306