[automerger skipped] Merge "NetworkTypeController listen directly to setPreferredNetworkType" am: 54914a51 am: 81aaf2d5 -s ours

am skip reason: Change-Id I66fba85b7e3d5f0e6c7cd2f08a11d4422c9be281 with SHA-1 dee0da5e is in history

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

Change-Id: I6806c48debfe0d0a3df86b3f7f2d9f821787b2dc