Merge "Update Policy Listener API naming." am: a93e2f9545

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83623e00d40a388b4c4534139a11990937514141