Merge "Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API" into sc-dev am: 4be4b3eee7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13929087

Change-Id: I7c1ad6e7817bb45b602f132f185c4d2f9bd002b3