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

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

Change-Id: Idac73348f3ac83d24a15d5a47c3afa01224016fb