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

Change-Id: I09534a5b9b961f1ac1ecf93172e1ae5c33cf5df1