Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc7

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



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