Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3bae71 am: 78eeb9b0 am: bc3fefba Change-Id: I2fa6998d854ca61aa18ef2e61ed6a7196ed0be4d