am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev

* commit '771c11b73941994d24e5da5851451ee4088499a6':
  Fix duplicate SSID entries in the WifiSettings UI