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

Change-Id: I27a5784ab5764b2d10fd6bc2ba76da68b89d8658