Merge changes from topic "vcn-network-policy" am: e980914d am: 8804aed9 am: a06b6244

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae9c814702f08d49ade0c47fbd5e903aa9887037