Merge "Animate the scrim and properly remove the expanded view" into udc-dev am: dda80824

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



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