[automerger skipped] Merge "Fix toString in RILUtils" am: 3df47e18 am:...

[automerger skipped] Merge "Fix toString in RILUtils" am: 3df47e18 am: 97451f5a am: 4c81244d -s ours am: 22214b12 -s ours

am skip reason: Merged-In I4727f284ac4349ddd174a33bd72f4f9a874e50a4 with SHA-1 20a7b688 is already in history

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

Change-Id: I2a0ee16fcab37f5d1237ac845c789b5cd184ce6c