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

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



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