Add carrier config overrides
am: b4dc0dcb3b

Change-Id: I203b56783b79b30d309fac0ad2ef23c86a8d9322