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

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

Change-Id: If41331ae05320776ae7e1486395080352a6f523f