Merge "Support for Venue URL and friendly name from Network agent" am: 88baf235a9 am: 67242ec449 am: 0bb4053aca

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52b5fdc3445d35a19c0281469b4780bc5fe12199