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

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

Change-Id: I845221848bb00355db98f0aa5a4341641e3ceec7
tree: 84e1ab44eff0b83276eef6f3c4fca1ca7f51c55d
  1. core/
  2. services/
  3. tests/