[automerger skipped] Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -s ours am: b742e21dc4 -s ours

am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history

Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077

Change-Id: I0841b8a6c0125a7976adb1b2eb89ff7776907503
tree: 4e89fe4575db7e202bccb2e259e84d4df9520638
  1. devicetree/
  2. net/
  3. Android.bp
  4. METADATA