Merge "Fix crash when trying to dismiss dialog" into tm-qpr-dev am: 0bfdbbf4 am: dec138b0

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



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