Merge "Restore WifiP2pDevice.primaryDeviceType formatting" into oc-mr1-dev