Merge changes from topic "vcn-network-policy" am: e980914d42 am: 8804aed91c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaae55908a50ab13bb335e4ca742c1335f2d088f1