Merge "Expose captive portal urls for configuration"
am: 7bb487a582

Change-Id: If5970fdafa7c624855ef9d29921542e2fb6fdfa0