Merge changes from topic "single_dialog" into udc-dev am: 0624d822 am: 251fe7b3

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



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