Merge "Revert "Attribute data usage to 5G for 5G non-standalone mode"" am: 13c5ee8313 am: f9c09d213c

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

Change-Id: If052329128326fba72ff27c024a2c6652b7bb1ef
tree: 894400bfeebeb40be6bbee55204d3cfbad46dd50
  1. core/
  2. services/
  3. tests/