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

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

Change-Id: Ib3aed17d6302b1a28796ead0037c5db629fbd4b3