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

Change-Id: Ic7a559a6a5759dc0528e2a2d167d999b208225dd