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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4425a3b4f27d4a73c7a7b3d4175bec6bb10b7882