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

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

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



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