[automerger skipped] Merge "Use updated VCN policy listener API." am: 384b4455 am: 049414db am: 603a53f7 -s ours

am skip reason: Change-Id Ib299a296fa2f1b5009b49923989d7db327a14e35 with SHA-1 3dca8d03 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1629085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I812a0abdc75f137e4dc4a296122bc4ca043ba33d