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

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



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