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

Change-Id: Ieb23e1e7177f85f7f0e8f6faba5a6644ef147a45