tree 894400bfeebeb40be6bbee55204d3cfbad46dd50
parent 2f1779db13fb7798bb3025ba492de3ece02685a0
parent a3d509537cb6dcbdc8f793fcd203b4ac6a35f7a9
author Treehugger Robot <treehugger-gerrit@google.com> 1594360315 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594360315 +0000

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

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

Change-Id: I76f64267c5cbe4516602f8526d6f8fee452c46bb