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

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

Change-Id: Id07f23e89ba9f683194219e4ff68ed4e1bc7e48c