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

Change-Id: I0fe05318cbb2321886ebba8b52fe4177054e293c