Merge "Implement Policy Listener add/remove in VcnService." am: 59035bd8c7

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6a3af9de981897cdd843f12d4c012da5929bc58