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

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

Change-Id: I933407d55e33a2cfac44ded44bc58fc0deb9da80
tree: 26efab19f81259e5a86f47643589f76d5379fb68
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS