tree dbb3ca114dea23323d1b302f3fbe471e4576d10c
parent 0b879354d6fd23f3433662019829decef0054bbe
parent 73543addf18264f36b135cd2dd72b9a45206480e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583443839 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583443839 +0000

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

Change-Id: I96f1ac63c85641cf90a53154252da5f3cc82a4d0