Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40
am: 7e80b882b7

Change-Id: I048c7b1ca915744da1e06e0280be125e7da2b796