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

Change-Id: I848fd4084f43b2aeb69cb5175c1c10de3355c21f