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

Change-Id: I0b25f3e10fe86ad46acf91cebc7edce50f0880cc