Merge "Fix NetworkScorerAppManager#isCallerActiveScorer." am: 48eecdcbc4 am: 7495cf633c am: d7f371813a
am: ea7931d107

Change-Id: I193abae0fef7cb976ef970085363822f4770215c