Merge "fix branch break by adding carrierconfig key" into stage-aosp-master