Merge "Remove callbacks and messages in onDestroy()." am: 1304c4aa57

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

Change-Id: Ib813c70351bd513b7cd7d77e948080bd7fa99281

packages/SoundPicker/src/com/android/soundpicker/RingtonePickerActivity.java

@@ -333,6 +333,9 @@ public final class RingtonePickerActivity extends AlertActivity implements
 
     @Override
     public void onDestroy() {
+        if (mHandler != null) {
+            mHandler.removeCallbacksAndMessages(null);
+        }
         if (mCursor != null) {
             mCursor.close();
             mCursor = null;