Merge "Revert "[Ranging] Register ranging service"" into main