Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 am: 5fbd2791ac am: 11b1311e21
am: 99ca0df8d4  -s ours

Change-Id: I735bd4d65c5764a3a7d6d288d45a57ec1ea98638