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

Change-Id: I46c61ae1be6b8ff0cfe10a9eb224d917d675cf32