Merge "[CarrierLock] Provided fallback support for Old API to read the carrier lock info." into main