Merge "Discover primary service by UUID for PTS tests (3/4)"
am: 77bb5f0924

Change-Id: Iaedbc0bcab5bd1c8a900eeb2e8dfa53be2b2c5bb