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

Merge changes from topic "single_dialog" into udc-dev am: 0624d822 am: fbf643dc am: 79cbe7dd am: 2be78c6b

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



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