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

Change-Id: I1f2b7190b329b5d418f4c3e92b411bf1c011a750