Merge "P2P: Fix hidl service discovery request" into oc-dev am: 553d451a3d
am: b77f4c6ed5

Change-Id: Ied993ed1fbebf9d6359d5500294bc1f18800b9b2