Merge "Attribute data usage to 5G for 5G non-standalone mode" am: c987a53a93

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

Change-Id: I89ed9dd80f6b30e43e59d91fdd3fb91fb0e9be45
tree: 6928031d57e4f8d4bfccd20dfbd2d4bb3bfd1e56
  1. core/
  2. services/
  3. tests/