Merge "Fixed consistent flicker on shade open after multitouch" into tm-qpr-dev am: accfd441

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



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