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

Change-Id: I0443c88a2953a2a0004bd926762503208fa81282