Merge changes I78e41528,Iaced3dbc

* changes:
  WifiServiceImpl: Return WifiInfo for secondary CMM if necessary
  WifiPermissionsUtil: Use new lightweight API for targetSdkVersion fetch
tree: a7032b123c140686d9786852fb2aba8698c6eaae
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg