[automerger skipped] Merge "migrate cdma home eri from resource overlay to carrierconfig" am: 76b53f0948 am: e707f6217e
am: 52910403c5 -s ours
am skip reason: change_id Idd11441e1a6d79954aa1bdb0f93a3567aaf2ecc1 with SHA1 4933ef2310 is in history

Change-Id: I322f64d408457ddc536eef9fc8519a902cf61de4