Merge changes from topic "mainlineVersion" into rvc-qpr-dev

* changes:
  wifi: get the correct mainline version when wifi is disabled
  wifi:get wifi stack version from  com.android.wifi
tree: fabf2afe7d0acc69e57ef0b318262d023969d367
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg