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