Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3 am: 425a0fdc am: ab9eb11e am: ad9ff9c5 -s ours Change-Id: I990d6c6a3aa7ad0fd170ba2b2d0c8a7c75232fe7