Merge "Add a new ssid field in NetworkCapabilities." into pi-dev am: 878d0e90b5
am: 8edf6543d2

Change-Id: I6dd1aba6fde5a502b4a9145cf16393d8ce623c89