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

Change-Id: I9909ddd5cf6c793e004b679ddb7c3d5fc36301a5