Merge "Improve AllowedNetworkTypesForReason and refactor PreferredNetworkType" am: b332627a15 am: 6035378f91

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia227678f0f38adc05bf6ea39eee0eea8ebfea582