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

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

Change-Id: I74c0d7d771d0b7e067dddc582389f77b8a899542
tree: b1da6da2012a90399dcee2a956ba22bb62069bed
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING