am 4ecee3f8: am 558f1030: am 74f93f9a: am d7408469: am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev

* commit '4ecee3f88e067ed0339a4e004996a3c69ce5480e':
  Fix check for caller being the active network scorer