Merge "Fix crash when trying to dismiss dialog" am: 3023a334 am: cea2abb7...

Merge "Fix crash when trying to dismiss dialog" am: 3023a334 am: cea2abb7 am: 68642fbc am: 3671f67e

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



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