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

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

Change-Id: I7d6640de7d23c8958bb642d4f92fe19806c10cd5