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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I581275ea0c6dba30f4b24534f8c4c1702d04a9c8