Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 47157e7711 am: 4bdea2a29b am: 281f77c93c

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

Change-Id: I933407d55e33a2cfac44ded44bc58fc0deb9da80