Merge "[multi-shade] Fix multi touch bug." into udc-dev am: 72a1258b

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



Change-Id: I3ff33e23c45341f2a21f86f7933971c43fb5a044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>