Merge changes from topics "addl_nr_band", "nr_advanced" am: e8376888

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1730691

Change-Id: I560031e75f57b35b88741a624083b503308c6c8a