Merge "Merge "Fixes the issue multi-touch causing launcher icons to be not clickable." into rvc-dev am: 94df0317 am: fed46df3" into rvc-d1-dev-plus-aosp am: 720cc7ea am: 9fc713bb

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

Change-Id: Iaa1e993d548c64572fd3d16b66419a4599577a6f