Merge "Animate the scrim and properly remove the expanded view" into udc-dev...

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

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



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