resolve merge conflicts of 31a2f413f8 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2d665a710a58d9e18d56517bffb69f42b9ffe7a6

src/com/android/settings/applications/PremiumSmsAccess.java

@@ -77,6 +77,13 @@ public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Cal
         super.onPause();
     }
 
+    @Override
+    public void onDestroy() {
+        mSmsBackend.release();
+        mSession.release();
+        super.onDestroy();
+    }
+
     @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.PREMIUM_SMS_ACCESS;