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

Change-Id: I918c68d7628a08784b9c20bfdf89365fd1250c6e