[automerger skipped] Merge "Log cleanup and fix conversions for AIDL RIL" am:...

[automerger skipped] Merge "Log cleanup and fix conversions for AIDL RIL" am: de7bc68e am: 47f77753 am: 2a965b4b am: c416d3df -s ours

am skip reason: Merged-In I62c842ed0dfd81f899bfd91f6cb02b746fb52b00 with SHA-1 ddf5d00e is already in history

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

Change-Id: I6fb879e11085de4dbc24b14b1657d1e32238005c