Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95 am: ab9eb11e2f
am: ad9ff9c59a  -s ours

Change-Id: I990d6c6a3aa7ad0fd170ba2b2d0c8a7c75232fe7