Merge \"Fix clang-tidy performance warnings in metricsd/uploader.\"
am: 5670005058

Change-Id: Ie1436d7ac4c4699fc1b7703785f82021f2b0123a