Merge "Refactor ApnEditCarrierEnabled" into main