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

Change-Id: I0cae77b1a560ff1b8ea14c76a39e2baf02c9f2f3