Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev
am: ef088843ae

Change-Id: I0b0e7912fcbdcb819a6b7f2e50f91eef18b8092a