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

Change-Id: I02802f762a62fc29ff383523d2c52ebd536a9715