[automerger skipped] Merge "Rename AllowedNetworkType to AllowedNetworkTypes"...

[automerger skipped] Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: 257b6ecf am: fe79cf12 am: a6b6fc05 -s ours

am skip reason: Change-Id Iba4855c4687c3fe44b52aa4041aa7bf3a625a231 with SHA-1 769ecaca is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bfd4144d6f83f038d206ca34ecde2b41fb7a9dd