Merge "Remove external/protobuf/.gitmodules and submodule directories" into androidx-main