[automerger skipped] Merge "migrate cdma home eri from resource overlay to carrierconfig" am: e5fd14aed5 am: 81e252c51d
am: f19990f19e -s ours
am skip reason: change_id I1ec160883282c8819727d3d56c909d9a1c7fd5d2 with SHA1 eb07e4ebff is in history

Change-Id: Ib097ce2a1b92f0e79515ff45b3ae625ee6dc242b