tree dbb3ca114dea23323d1b302f3fbe471e4576d10c
parent 20aaa198f3b58cb3b98fb438d42a4887b39a73a1
parent 33dbf83f16a1dd84ed2201b99d4b5b553c3e524f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583441860 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583441860 +0000

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

Change-Id: Icdad561d32e1e7a1b2c395caaaf400e5660b7939