[automerger skipped] Merge "Update Policy Listener API naming." am: a93e2f95 am: 84249141 am: 40f90c94 -s ours am: 7af6f2e4 -s ours

am skip reason: Change-Id I026eaefa62d8f64b9180fc182a7cf0605d83bf97 with SHA-1 a96ec138 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d641cd6ada808ece0cdd5d663d1282b11ab8d16