Merge "Fix bouncer flickering on dream swipe up end" into udc-dev am: 20607497

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



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