Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev
tree: 13b3c888bb582952f41a7200a9e78b1912c8dafc
  1. core/
  2. services/