Merge "Zero out the non-prefix bits in NetUtilsTest" am: 5619ef3387 am: c52f92de02

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1556262

Change-Id: I456b14bd775e39afeaf1b8c3c08dcb59f50ba85d
tree: 9f05d3cb632856166c7ee20d6447aeee8cca7399
  1. staticlibs/