Merge "Showing dialog even when dismissed externally and timeout didn't pass" into udc-dev am: 4538ab9b am: 1e2062e9

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



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