Merge "Add metric constant for settings preference int value change." into oc-mr1-dev
am: c91b3bd09c

Change-Id: Ibfbcf198fbd7e6a434d5ea34f30cd989e8a81024