[automerger skipped] Merge "Fix inconsistencies in...

[automerger skipped] Merge "Fix inconsistencies in setPreferred/AllowedNetworkTypes" am: f5ad418f am: 236b9e8e am: 4fb78e25 am: 9d541cf6 -s ours

am skip reason: Merged-In If021c217105ada69c75317fcaff2c09b4e499eb6 with SHA-1 f4f5cdec is already in history

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

Change-Id: If267cfdefe0337638eafed81bfba1b9c4a60adf9