Merge "Add RequiresDevice to relevant tests" am: 8e58917bc3 am: b4923dd4e5

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

Change-Id: I906716aa38bead1d16d47b31f5402263916be0bd