[automerger skipped] Merge "Dump netstats.proto to bugreport" am: 9a3a457f...

[automerger skipped] Merge "Dump netstats.proto to bugreport" am: 9a3a457f am: b2dd1e30 am: 29874567 -s ours

am skip reason: Merged-In I3ef024ac39f81ab086586697f4ce8b253c21192f with SHA-1 24d215db is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2077619



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