Merge "ApnEditor: Consider subId when reading carrier config"