Merge "Merge "[PASSPOINT] Add metrics to determine deployment/avail of Passpoint" into oc-mr1-dev am: 4689a6d979" into oc-mr1-dev-plus-aosp