Merge "Moved channels settings from carrier config to resources" am: 79eddf8c0a
am: 54ccaa0e99

Change-Id: I44d1e2602867049c9e82911a5b4066e6f0c88d7f