Merge "Remove @hide usage and fix NetworkPolicy backup" am: 027b7e9604

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

Change-Id: I8ba2d7d1266ac8b0ad3d68b59824291ed325734e