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

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



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