Merge "Make WifiDeviceFilter.Builder.setSsid's arg @NonNull" into rvc-dev am: 4256be1c am: 12b0c0c3 Change-Id: I284ea0888db64a6e2431f2da2e3a1b1a9d56009d