Merge "Merge "[API Feedback] Rename getChannelNumber to getNrarfcn" am: 8273d66ebc am: b7f5e3782c am: 746e386b86"