Merge "Add metric constant for settings preference int value change." into...
Merge "Add metric constant for settings preference int value change." into oc-mr1-dev am: c91b3bd0
am: 8d1357e1 -s ours
Change-Id: I1cc458110a4c2320d133d00b301ac206fbc78f4a