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

Change-Id: Idb9754a4b30b613fd02bc37adf2d9973b419b5e9