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: fed46df3 am: 4bd59233

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

Change-Id: Ie04f9e8c50f08a7f10bdf32eaf31263c783f552a