Merge "New Metrics constants for captive portal related UI" into stage-aosp-master am: 369bbf5d05
am: 06f8914e3d  -s ours

Change-Id: Ica33b5ad53a52af9d95d2bc8c606ee6fedd776a4