Merge "ApnEditor: Consider subId when reading carrier config"
am: f6f7079709

Change-Id: I8d49e7f38528da4f5fc0cd18eecfd59854b7505f