[automerger skipped] Merge "Update UL values for NR" am: de4959769d am: 34c00e7865 -s ours am: 0510319743 -s ours
am skip reason: Change-Id I2d548711c5de9683b57dc7bbeea9379d23b18343 with SHA-1 6963421dfe is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1346647
Change-Id: Ib6fdc25e26f1100ed99385d0d62cebbe8b170983
This commit is contained in: