[automerger skipped] Merge changes from topic "switch_logging" am: 9e076762...

[automerger skipped] Merge changes from topic "switch_logging" am: 9e076762 -s ours am: 1cfd4e34 -s ours am: 6c239f5f -s ours am: 77471a28 -s ours am: 68fa7e1a -s ours

am skip reason: Merged-In I5060d63d5c8c80e1a1821646ba3888e3cf4b686f with SHA-1 54286d2e is already in history

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



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