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

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

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