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

Change-Id: I5da974b3b914c2581e8b315016ee2c2ff53ad45d