Merge "Showing dialog even when dismissed externally and timeout didn't pass"...

Merge "Showing dialog even when dismissed externally and timeout didn't pass" into udc-dev am: 4538ab9b am: 0e51cbce am: 5a6b4f66

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



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