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

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



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