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