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: f2c45d55 am: 12868e4c

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



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