Merge "Mark NetworkStatsServiceDumpProto userdebug_and_eng_only" am: 0843c02abc am: 5a46037e6a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954377

Change-Id: I05760b6a52c24f16f99e2e6928f9e6e26e4c3f5e