Merge "Move the CtsHostsideNetworkTestsAppNext to avoid automerger conflict"