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

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

Change-Id: I2db95fe9dcb1192106314600ee8b413a16599dd9