Merge "migrate cdma home eri from resource overlay to carrierconfig"