Merge "Support "dumpsys connectivity trafficcontroller"" am: bce8cbabbb am: d1eaf3d319 am: 57c9a1f5af

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

Change-Id: I60ef5b303c191f7e2eb186de074262e11cc4bba9