Merge "Disable device config syncing by default in test harness mode" am:...

Merge "Disable device config syncing by default in test harness mode" am: a680cb9c am: bf4063b7 am: 21ba7f3f am: 42105605

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



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