[automerger skipped] Merge "Update Policy Listener API naming." am: a93e2f9545 am: 8424914179 am: 40f90c941f -s ours am: 7af6f2e429 -s ours
am skip reason: Change-Id I026eaefa62d8f64b9180fc182a7cf0605d83bf97 with SHA-1 a96ec13821 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629359
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23ad6dd7480636ee0d2ffb8c30cd6faab4d96084
This commit is contained in: