Merge "Add metric constants for cross profile settings page" into rvc-dev am: 767e63f5 am: c3e2a608 am: 7ac3f1ca Change-Id: I247c168f664ae10f53fc520f5c337c4a29c29e7f