[automerger skipped] Merge "Update UL values for NR" am: de495976 am:...

[automerger skipped] Merge "Update UL values for NR" am: de495976 am: 34c00e78 -s ours am: 05103197 -s ours am: fcbd21fd -s ours

am skip reason: Change-Id I2d548711c5de9683b57dc7bbeea9379d23b18343 with SHA-1 6963421d is in history

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

Change-Id: I379a8737055470a4908702db667d80b3c24a4190