[automerger skipped] Merge "migrate cdma home eri from resource overlay to...
[automerger skipped] Merge "migrate cdma home eri from resource overlay to carrierconfig" am: 27b093b7 am: c2ea727b
am: a92028cb -s ours
am skip reason: change_id I44d6a6814f5d14230551998317e2a8305b415341 with SHA1 cdee099a is in history
Change-Id: Ia47c954e659c67d3098a80e5050ef2f67bd21373