Merge "Move perUidCounter increment to outside NetworkRequestInfo constructor" into main