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 am: 06eab40b

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



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