Merge "Add 5G/NR QOS support" am: 0deb814870 am: 05e4507857

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

Change-Id: If32e710cfea988dbaa438ffee547707aa06e6545