Merge "Add extra logging to NetworkTypeController" into tm-dev am: c332e127 am: b73c0685

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



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