Merge "Revert "CaptivePortalData: use CharSequence in VenueFriendlyName API"" into sc-dev