[automerger skipped] Merge "Preferred network mode transform to BitMask type."...

[automerger skipped] Merge "Preferred network mode transform to BitMask type." am: ac8899fc am: 86b8bbce -s ours am: 0a7e5359 -s ours

am skip reason: Change-Id Ia125656a255d8ddec7b68e4d69c9eb299f74d5f9 with SHA-1 dd324252 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1347345

Change-Id: Id6985099cfd298fe1a53528a8db4552171fe26b8