Merge "Remove local dynamic array" am: 33dda50e8a am: ff7fde0faf

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

Change-Id: I26829677d160cfccee2b30d58ccce6e36e6d1743