Merge "Merge "Fixes the issue multi-touch causing launcher icons to be not...

Merge "Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df0317 am: fed46df3 am: 4bd59233" into rvc-qpr-dev-plus-aosp am: eab52820

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

Change-Id: Ie034f0a2beebe9359e31f99dfe2ee4419f8601ed