[automerger skipped] Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -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: If14bb6877f66ab89b75ddfba123eeb929a89924c
tree: e711c00c3a75051e92f05b9bd73330a03752a45a
  1. devicetree/
  2. net/
  3. Android.bp