Merge "P2P: update WifiP2pServiceResponse creator" into oc-dev
am: 387b97e68b

Change-Id: I78fb0ac1f49d4a122cfe790fad2d0d7cb5de1589