Merge "New Metrics constants for captive portal related UI" am: aac9aff5dc am: 75792d4299 -s ours am: 97520fb0dd -s ours
am: 0eddee8c78 -s ours
Change-Id: I95ce785b1c35aa6732bd571c39509baee6e5cc1b
This commit is contained in: