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

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



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