Merge "Add 5G/NR QOS support" am: bd3a33ed9f am: 3e7751c427

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

Change-Id: If32e710cfea988dbaa438ffee547707aa06e6545