Merge "data saver test exception for wear" am: f900a64af4 am: 11d1a17808

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

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