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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8f462fc38255cdb41edc833f4b6e93f14d3290d