Merge "Use resource instead of carrier config"
am: 78ba85cdd7

Change-Id: I75837cbdc10d76e8a997892bef6775429b4b17b3