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 am: c2831789

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



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