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

Merge "Merge "Showing dialog even when dismissed externally and timeout didn't pass" into udc-dev am: 4538ab9b am: 0e51cbce am: 83413bf1" into udc-qpr-dev-plus-aosp am: c385ad77

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



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