Merge "Cherrypick: Create ScoredNetwork Badging API changes." am: e34e47d645 am: 3098d3839f
am: 4962a3829f

Change-Id: Ia3928c4113e8f07969a3d551e31d6307f61e848e