Merge "Merge "Update Verzon eri_311480.xml to v7." into oc-dr1-dev am: 1230d603b1 am: b0aaeee1b8" into oc-mr1-dev-plus-aosp
am: bbac915c1d

Change-Id: Ife82459df845eeba1c6cb87dcd2a228ff02d2a28