[automerger skipped] Merge "DO NOT MERGE Re-restrict phone ops on user...

[automerger skipped] Merge "DO NOT MERGE Re-restrict phone ops on user addition" into sc-v2-dev am: fee8b3a1 am: f6ac981a -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/16982321

Change-Id: I7a3d01b051f1749d1af22603330bbfebe57ba778