Merge "DO NOT MERGE Re-restrict phone ops on user addition" into sc-v2-dev am: fee8b3a1ca

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

Change-Id: I89dd56f7322a5b35fd560c130dca7ff6ca11ef9f