[automerger skipped] Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module" am: 5b57190f08 am: 0564779e76
am: 126fb85c29 -s ours
am skip reason: change_id Id5a66189150e7a088127519373a832f63bdd12ac with SHA1 c278f80c28 is in history

Change-Id: I3e9ab075b8228250bf59fc54c5d12f977c686861