Merge "CarrierConfigure: rename properties" into p-keystone-qcom