Merge "multi-carrier overlays: Add eri and config for US Cellular" into cm-11.0