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

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

Change-Id: I3820ae217fed1ddf6ec7bbb070d489e2ad438e57