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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If22d811bfa933cae37afdc15dea6f43275bd128b