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

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

Change-Id: I5a835dbcaea70dcb441ea79dba0a9b08a9a34306