Merge changes from topic "aidl_tostring" into tm-mainline-prod am: 7f3d99c4

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



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