Merge "change parameter type for 32bit platform" am: f1575d44a9 am: ca26310e0c

Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/1353378

Change-Id: I890e1b9395ebe8f17d5739fb3169f9a9b80282b0