Merge "Merge "Discover primary service by UUID for PTS tests (4/4)" am: abb732fc40 am: 7e80b882b7 am: 23105d57d5" into oc-dev-plus-aosp
am: 4df112a54c

Change-Id: Ie6a2b3a54db56c607c51772592fdc2b44a108c63