Merge "NetworkScoreManager: Add @SystemApi for wifi mainline module"
am: 5b57190f08

Change-Id: I73c98d9dcb43f2db1e74f6d431f07ac90ee813e6