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

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

Change-Id: Ic08d7c1d82693696a67d4f16115f0b8dfdbe705d