Merge "Merge "Update UL values for NR" into rvc-dev am: a4d247cf am:...

Merge "Merge "Update UL values for NR" into rvc-dev am: a4d247cf am: bc1b5f3f" into rvc-d1-dev-plus-aosp am: 733f98de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11739778

Change-Id: Ic20a6e372ae09736e7b65d79ce001e7aef06316e