tree 111f013ff566d40599f3182bceb5987004da02c4
parent 7e9f9ed9f9a374f057de818bc6871f5ee1a65108
parent bef2f5be9465c3441750f38f0c8b08256f97a0d4
author Les Lee <lesl@google.com> 1619493991 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619493991 +0000

Merge "wifi data usage: support to get carrier merged wifi network." am: bef2f5be94

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

Change-Id: I01b6790de48a514256f51ebb85226e56c6e2f59b