[automerger skipped] Merge "Add extra logging to NetworkTypeController" am: 98bf7c06 -s ours

am skip reason: Merged-In I26d8770fde4a2fbdc78ccd3f280a11b9cd39fdbd with SHA-1 c2be94a8 is already in history

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



Change-Id: Iddef722d9d1203c633c3b4409b391d4381b681ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>