WifiCountryCode: Add null check

Also, addressed a nit from previous CL.

Bug: 180234189
Test: atest com.android.server.wifi
Change-Id: If7f8863933b8a206a4caee4b6be8d0c84241294d
3 files changed