[automerger skipped] Merge "Fix TaskView cropping for transient taskbar" into tm-qpr-dev am: 42c1669f am: 31deae8a -s ours am: da3694bb -s ours am: ec02664c -s ours

am skip reason: Merged-In I4538bd665dfef0febc297a3edca7b1ed97b34d23 with SHA-1 071b99dc is already in history

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



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