Merge "[Telephony Mainline] Remove hidden API usages in CarrierAppUtils"