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

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

Change-Id: I91ecac9ba0cb0dc15f8aa4d2df927e8e8ef5ff64