Merge "Fix NetworkPolicy logs in dumpsys." am: bcca41baac am: 87e632d7d7

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

Change-Id: I00b2ae9116f602eaca4e43f44d097adc4a6e60af