Merge changes from topic "upstream_data_usage" into main am: e09e029568

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3249972

Change-Id: Iefe6c72fa447aac29b48d9b1ee26eea4a93003de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>