Merge "Move perUidCounter increment to outside NetworkRequestInfo constructor" into main am: 0c632726c3 am: 6a3b97f10c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3099617

Change-Id: If0a7dddf94c2bebbd8c738a3ed609028280586c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>