This is a no-op refactoring. Test: m connectivity_multi_devices_snippet && \ atest CtsConnectivityMultiDevicesTestCases Bug: 335368434 Change-Id: I415cc22f49c437be6fe8e8ae8822af22ebefe8d1