Merge "Define a meta-data attribute for a carrier icon." into oc-dr1-dev
am: 963a20772e

Change-Id: Ic64dff49ecec45c4c77486196a8661beec3b142f