Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
am: ae3bae715e

Change-Id: If47b5c5fae03ad2e6a68771da893acaad743fcbd