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

Change-Id: Ibaeb65a2860e65d4a458801ee09f7688e33b5950