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

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

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



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