Merge "[WifiScoreReport] Include scores in dumpsys" into oc-dr1-dev
am: 7f170dec60

Change-Id: Ief179bcf52c07d8f414bdc62d175843f07bfedb8
tree: b87eb6f7d9c46d34cb6e6d277674fa9d5fe75a20
  1. service/
  2. PREUPLOAD.cfg