Merge "Add DisableConfigSyncTargetPreparer to CTS/MTS" am: 2aae895972

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999078

Change-Id: Ibf9bb6c038be3ab7d5c2ff8137cc56d8c88604fb