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

Change-Id: I8fc3a45a910294c46982bac9a3f6e183977aad16