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

[automerger skipped] Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a am: 6035378f am: 03297aac -s ours

am skip reason: Change-Id I3d0c119a0c2a30c56b0c127ba6525f8992b4e9dd with SHA-1 7d95185d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ab9ba082546661985f097f2425a597618a60ebf