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: 1d848369 am: 4161d5c0" into udc-qpr-dev-plus-aosp am: 99049aa2

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



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