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

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



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