[automerger skipped] Merge "Platform changes needed for CarrierAppUtils...

[automerger skipped] Merge "Platform changes needed for CarrierAppUtils integration tests." am: cfb344e5 am: c3ade30e am: 80225ade am: e4cd9299 -s ours

am skip reason: Change-Id Idfa5520f17c3e57712a666ffd67de9197ad4b1c7 with SHA-1 afe623e3 is in history

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

Change-Id: I1417e07a3f0c11b9dcdda861aca1e0ef329f3855