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

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

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