am 1451df28: (-s ours) am 027e3b7f: Merge "Fix check for caller being the active network scorer" into mnc-dev

* commit '1451df28162978ac0609690357d8f0d9e1635c16':