Merge changes I8fe85295,I74ada04d

* changes:
  [WPA3] Restore @hide to WifiConfiguration#SuiteBCipher
  [Passpoint] Create an API to get a unique identifier