Merge "Support for Venue friendly name" am: 6776ba075c am: b1f7758f6d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1515242

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If51d48964d6294764017990934eed59319c3aa5f