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 am: b2f5bfcf am: 61dda21b

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

Change-Id: I22ca7c23aee67275b3fab108a01b33aa4dfdc6da