Merge "Add Data Saver utils in Firewall test helper class" into main am: 90428539d6 am: 7ce31cdcbb

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

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