Merge "Fix NPE in WifiCarrierInfoManager" into sc-dev