fix branch break by adding carrierconfig key am: e787323e03
am: 1e1c060378

Change-Id: I0d76442494289c6b920c84a7c07bd635f515da88