Merge "Fix taskbar linger above notification shade" into tm-qpr-dev am:...

Merge "Fix taskbar linger above notification shade" into tm-qpr-dev am: 6488e7fe am: d6c98086 am: 86a93d46

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



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