Merge "Fix mismatched allocation/deallocation" am: 5c1f34d918 am: 78865000d5 am: 88a4f2c36c

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

Change-Id: I2a30ffa4f776d00a3e012aa5ee913975f2f8b2df