Merge "Fix transient behavior with task bar" into tm-qpr-dev am: 84e84a13

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



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