Merge "WifiP2pManager: Add annotation Nullable for API: onDeviceInfoAvailable"