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: 1d848369 am: 4161d5c0

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



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