Merge "Fixed consistent flicker on shade open after multitouch" into...

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

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



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