Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632 am: 6b6f1b9e12
am: 28212c1b29

Change-Id: I478ebcd9f2d98e35a3ae408d027b67d69de79c09