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

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

Change-Id: I66419bdd347859608dbb0516601cbddb65d06912