[automerger skipped] Merge "Make action provision protected with extra phone...

[automerger skipped] Merge "Make action provision protected with extra phone ID" into rvc-qpr-dev am: 8119a319 -s ours am: 787e0f67 -s ours

am skip reason: Change-Id If822e874e58e2f5378a5cfdc4619e7b1881b6388 with SHA-1 670b957e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c567b8c4afbad3374d179febaacec07ad593b95