Merge "Merge "Add metrics constant for data plan usage screen." into oc-mr1-dev am: cfc55bb0" into oc-mr1-dev-plus-aosp