Merge "Disable modernize-use-trailing-return-type clang-tidy check"