[automerger skipped] Merge "Fix TaskView cropping for transient taskbar" into...

[automerger skipped] Merge "Fix TaskView cropping for transient taskbar" into udc-dev am: de0cadf4 am: 9b10cd69 -s ours

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

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



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