Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
am: e587591c5a

Change-Id: I7546e77a0a591ce25b2c771c30b4506d5666cc3f