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

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

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