Merge "data saver test exception for wear" am: f900a64af4 am: 8d61a3e01b

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

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