Merge "Improved PhoneSwitcher logging" into tm-dev am: c32eabef am: 8fd25257 am: 8d39033c

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



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