tree 3058575820f0225167e0690b3deac196a5f57c6e
parent 5bac02d8717d2e8a7adda172548c5028a3373528
parent d8c321f39c72e36fabfcefeafbde21df8dd5cd68
author SongFerng Wang <songferngwang@google.com> 1614921725 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614921725 +0000

[automerger skipped] Merge " Improve AllowedNetworkTypesReason and refactor PreferredNetworkType" am: 8c26f14514 am: ab7c79e3db am: d8c321f39c -s ours

am skip reason: Change-Id Iabf3c3294d69cc8d3708d4450f00c2a2f2c74b4f with SHA-1 3ef3e07e88 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e501ff126087240d0a77b935326b678702fdbd9