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

Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df0317

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

Change-Id: Icae3589b44c4a98f67afc659f62346db8a6ddd65