Unregister the listener in onStop() instead of onDestroy()

Bug: 3259661
1 file changed