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

* commit '558f10307c65e5c0a3e0e11a4abca4a083f751dc':
  Fix check for caller being the active network scorer