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

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

Change-Id: I5bc4dd27fd1fe08ec33b415321d6fc282f3c1b9a