Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev