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

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

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