Merge "Re-restrict phone ops on user addition" into tm-dev am: 774394e2

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



Change-Id: Idf1cf6ad241b347752edb2be235a3e9844d47880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>