Merge "Set the device_config_sync baseline back for FrameworksCoreTests" am: 4d07687915 am: 5786473a37

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2280531

Change-Id: I884e06ec02474e8b6a5dbad0571e3a742d5638d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>