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

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

Change-Id: Ife60cb4e97384da6c07ced1bfda49a156bd26bf1