Conflicts: services/java/com/android/server/content/SyncManager.java Change-Id: If4c3275300892934e11faa7a624c1f2486a64c08