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

Change-Id: I19586d174fe2b6b2eac8f68525a81e7cb6039fc0