Merge "Unregister the dialog listener on detached" into sc-v2-dev am: 27b46824cb am: 6ee57307ec

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

Change-Id: I675e91044009c246a448c1742968efc3223db854