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

Change-Id: If20f6b08ac973d621f6f9deff1895b4537666ae1