Merge "Shorten 'dumpsys connectivity trafficcontroller' for sLocalNetAccessMap and sLocalNetBlockedUidMap" into main am: 0613620f40

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

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