[automerger skipped] Merge "Add extra logging to NetworkTypeController" am:...

[automerger skipped] Merge "Add extra logging to NetworkTypeController" am: 98bf7c06 -s ours am: f58685e0 -s ours am: 8bc338f0 -s ours am: cdcf356a -s ours am: 7576104c -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: If8bf83b8a513c3688cbbc3cbe9f922d6cc52f287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>