Merge "Change USCC EriText for roaming indicator 1 with U.S. Cellular" into pi-dev