[automerger skipped] Merge "Fix conversion errors in RILUtils" am: d23cda2e...

[automerger skipped] Merge "Fix conversion errors in RILUtils" am: d23cda2e am: acfe01d3 am: b1f70726 -s ours am: 61d13dde -s ours

am skip reason: Merged-In I6fe6eb8cbd9a7ee758b4fd7bf82ae5574662d346 with SHA-1 67a0201d is already in history

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

Change-Id: I7640f7faa878dcaf76565d6593e38cf5bc2d20d2