Merge "New Metrics constants for captive portal related UI" am: aac9aff5dc am: 75792d4299  -s ours
am: 97520fb0dd  -s ours

Change-Id: Ia8e70a92b70cc1321024156c5a8879352827d567