Merge "Include CaptivePortalLogin in PRODUCT_PACKAGES am: 8e542c314c am: 61ec89d990" into nyc-mr1-dev-plus-aosp