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

* commit '74f93f9a8c3d938755f010803e6f9b1e1476b7b1':
  Fix check for caller being the active network scorer