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

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

Change-Id: I6a0751cf97f1ea5f46695c5748f9bf3965bfac56