Merge "Revert "[UTC][capi-network-bluetooth][ACR-626][Add GATT server TCs]"" into...