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

Change-Id: I190f53b2d8aa4202a9f20f3831581414185962d3