[automerger skipped] Merge "Remove @hide usage and fix NetworkPolicy backup"...

[automerger skipped] Merge "Remove @hide usage and fix NetworkPolicy backup" am: 027b7e96 am: 3ebe8bd2 am: 1a2183a6 am: cdd8c9a6 -s ours

am skip reason: Merged-In I45a98795c571ac97bd6025988da156bd06d57e45 with SHA-1 e839e63d is already in history

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

Change-Id: Ib05a59ff6e7aee530ee067fdef1d582fff099b90