Merge changes from topic "am-44bf69e509ea4fe6aecd061fb9463ea9" into android12L-tests-dev

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Revert "Skip TC as some network operators disallows editing VoiceMailNumber"" into android12-tests-dev am: e2238233aa -s ours
  [automerger skipped] [DO NOT MERGE] Revert "Skip TC as some network operators disallows editing VoiceMailNumber" am: eb7dccae67 -s ours