Merge "Add 5G/NR QOS support" am: df448f6eaa am: 6ed7c1c523

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

Change-Id: If32e710cfea988dbaa438ffee547707aa06e6545