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

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

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