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

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

Change-Id: I07764753b51bfd6133512a480ed415dae1639cab