Merge "Remove local dynamic array" am: 33dda50e8a am: ff7fde0faf am: 7ecc69ca36 am: c047af24ff

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

Change-Id: Id9d4a794c3f72af73e5d4e6bbab6d632ac1d3533