[automerger skipped] Merge "Let new data stack support updateNRFrequency" am:...

[automerger skipped] Merge "Let new data stack support updateNRFrequency" am: 83f543d6 am: 083626b4 am: f4c94f56 -s ours

am skip reason: Merged-In I5f2f3829c47a11f8c9aac13a9db9a8f26866ed4a with SHA-1 6311e6ae is already in history

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

Change-Id: I582d2374e19fa56fd594f214ea171a49ced1ceac