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

Change-Id: Icf369fc41387dbd1ed854434f2d77ecd867c4532