551bd968f9
* commit '2599c660bebc08d50b35f0b2bb46481610b8ebe0': DO NOT MERGE - Make sure to return network type after conversion DO NOT MERGE - Radio Access Family related fixes DO NOT MERGE - Multi-sim device would show 2 PLMN in status bar even if they are same. Add plumbing for merge failures and renable button. (3/4) Changed logging tag. Fixing issue where conference calls enable speaker phone. Add videoStateToString on videoProvider Class. Update the SmsMessage.createFromPdu() API call No Permission check for WiFi RTT add a parameter to carrier messaging calls to request delivery status Added parameter to avoid having a stream opened, and with that, file truncated on no-op. Make onlost/onfound APIs public IMS-VT: Enable video calls add injectSmsPdu with subId to ISms.aidl Fail SmsManager requests if SubId is not active.