Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: f678876c62

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

Change-Id: I26db95ad9d91dec40a62b7e4c4c0b77133ddb5d3
tree: 6d6ad44bd424ce1ed9824066760e9ad92231265e
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS