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

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

Change-Id: I633be4f92b2fa3a9e724ede0c4183849adf083cf