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

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

Change-Id: Icd4c21b9731256c9b3d39bffc5fddc43276c5fda
tree: 493167397762ef73dbebbc4ec7dfbe08f1823c85
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING