Merge pull request #15960 from dwi2/bug964755

Bug 964755 - Make sure WifiHelper.getCapabilities() return non-null valu...