[automerger skipped] Merge "Improve AllowedNetworkTypesForReason and refactor...

[automerger skipped] Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: 560c403a am: 923dbb92 am: 5f6d6be6 -s ours

am skip reason: Change-Id I0bfb8f8f8aeb7981b6fd990b8a8fb6431a72b7fc with SHA-1 f7759c18 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfeacf08c46c67c417293a76c60e7d612079873f