[automerger skipped] Merge "The AllowedNetworkTypes doesn't convert to hal's...

[automerger skipped] Merge "The AllowedNetworkTypes doesn't convert to hal's RadioAccessFamily" am: ab604a06 am: f521ac9c am: b17e5d97 -s ours am: 946e7c6e -s ours

am skip reason: Change-Id I5e9a538136fc486387075fd66be18345abfda0ae with SHA-1 493dd5df is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e9fd48b940b127f85a8f456537eb6a841b62cf9