[automerger skipped] Merge "Fix touchexploration multi-finger gesture...

[automerger skipped] Merge "Fix touchexploration multi-finger gesture conflict" into sc-dev am: d37ca1e6 -s ours

am skip reason: Change-Id I310cf6e3fb2cb2b5b6fbc6a0ba9f0aa1d219b4df with SHA-1 cb49d47b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13706205

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4e0c0cc95c1890bb29d1fc7cccfb95d06fb246a