Merge "Define new network scan RIL API"