Merge "Run clang-format on ServiceConnectivityJni.cpp" into main