tree f0499e890de7046c5d32c7451168aee5d751fece
parent fb3d781954ae9af51388885b9b4cefc625f030b5
parent ab7c79e3db78000c4c5fc4d035bb943765ad0753
author SongFerng Wang <songferngwang@google.com> 1614921463 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614921463 +0000

Merge " Improve AllowedNetworkTypesReason and refactor PreferredNetworkType" am: 8c26f14514 am: ab7c79e3db

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1615179

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb5ebed3656dfec02381de9e274065c61171cae1