[automerger skipped] Merge "Fixed out of memory when running telephony unit...

[automerger skipped] Merge "Fixed out of memory when running telephony unit tests" am: 62294657 am: 04104cba am: ddf44237 -s ours am: d0c93c2e -s ours

am skip reason: Merged-In Ib8e37aa5b62e56f246063f820a848c3373965b72 with SHA-1 4e232b99 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2008597

Change-Id: I39a539b0d1ac435c39bd799a9e68fbfab6395550