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

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

Change-Id: Icdca158885f04b84d00ca05172693bc646fed518