Merge "[WifiConfiguration] Add @NonNull annotations to BitSets"