Merge "Add metric constants for cross profile settings page" into rvc-dev am: 767e63f5f5 am: da6d0054aa

Change-Id: I0d4f950c1f2847564df7d1d3d2822cf15a05e0ff