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 am: 235a1deb

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



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