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