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

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

Change-Id: Icd4c21b9731256c9b3d39bffc5fddc43276c5fda
tree: 7730571d57c22cb4783a32640002a34dae9cbd48
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING