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

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

Change-Id: I22f896a90c488e42e06ec7e824f9bc2570cc0a5b