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

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

Change-Id: Ib5f64a801af85e8e045d7d07b91bd073a3ea9a5c