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

Change-Id: I73fac0b3122886cc477c3d4e2bcfc86f464f4748