Merge changes from topic "all_the_logs" into tm-mainline-prod am: 88fb1c7b

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



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