Merge "Shorten the log in the netpolicy dump."
am: 8c3e12a904

Change-Id: I41e80dec4d20c83e51ca212adcacdbab81d309e1