Snap for 4628106 from 737093efd3 to pi-release

Change-Id: I5fcca2e24b47b09043103e7256c2afa14bfdf794

src/com/android/messaging/datamodel/SyncManager.java

@@ -17,7 +17,6 @@
 package com.android.messaging.datamodel;
 
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.provider.Telephony;
@@ -309,14 +308,6 @@ public class SyncManager {
             // Primary users default SMS app - don't monitor telephony (most changes from this app)
             mNotifyOnChanges = false;
             mSyncOnChanges = false;
-            if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
-                // This is default SMS app but on Auto platform, even default SMS app needs
-                // to be notified of changes because Bluetooth makes changes to Sms database
-                // (thru ContentProvider). Content Change notifications help the default SMS app
-                // refresh display with changes, whenever Bluetooth changes data in SMS db.
-                mNotifyOnChanges = true;
-                mSyncOnChanges = true;
-            }
         }
         if (mNotifyOnChanges || mSyncOnChanges) {
             context.getContentResolver().registerContentObserver(Telephony.MmsSms.CONTENT_URI,