Merge "Cherrypick: Create ScoredNetwork Badging API changes." am: e34e47d645 am: 3098d3839f am: 4962a3829f
am: 4892f7d98f  -s ours

Change-Id: I6aa58a64b1ce926363ca685041fed92cdd615bc3