Merge "Fix NPE in AutoSyncWorkDataPreferenceController" am: cdd628e6e4
am: 0bc6b461be

Change-Id: I78899aef7b43c067f7c4094d7de63b95c4ee3f11