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

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

Change-Id: I845221848bb00355db98f0aa5a4341641e3ceec7