Merge changes from topic "b-186518774" into sc-v2-dev-plus-aosp

* changes:
  [automerge] DO NOT MERGE Re-restrict phone ops on user addition 2p: 7fac473e33
  DO NOT MERGE Re-restrict phone ops on user addition