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

[automerger skipped] Merge "Make action provision protected with extra phone ID" am: c93fb9c2 am: c8596bb2 am: bca681d3 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29bf93118e7e04f6be2736636e1ce5a42178c84b