Merge "Remove usage for deprecated ro.radio.noril"