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

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

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