Merge "Merge "Define a meta-data attribute for a carrier icon." into...
Merge "Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev am: 963a2077" into oc-dr1-dev-plus-aosp
am: 3806a1d4
Change-Id: I0af40ca1281103c1b82a8046339a42bb0cf3dc33