Merge "migrate cdma home eri from resource overlay to carrierconfig" am: 76b53f0948
am: e707f6217e

Change-Id: I4f6903635bf00b968dc61e76eec7f6db605b4d66