Merge "Fix check for caller being the active network scorer" into mnc-dev