tree e41244d8fab78e1978c31320950d8529ff023ef6
parent a1301d5850eedbf7c2b1dd459ddbc4ebb8dc37de
parent b20ac232a3ae01f20ab5a3e2966647e2a077850d
author Treehugger Robot <treehugger-gerrit@google.com> 1594358801 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594358801 +0000

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

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

Change-Id: I0b5da0e4e20cbd2dd5856b04d1f1ddfe3323b10b