Merge "Merge "[Wi-Fi] Add new unit test file WifiP2pSettingsTest.java." into rvc-dev am: a4590dc227
am: ab43d59d5d" into rvc-d1-dev-plus-aosp am: b0251be0e2
am: 3eee8dc74e
Change-Id: I87d7071c9959bc3a378e8857bc285c4f6658c47c
This commit is contained in: