Merge "Get carrier config value by subId"
am: 36bbab16d4

Change-Id: I3f9ef4d3c76932c29ab44a4c76859e8cb80787f2