[automerger skipped] Improve xfrm net test
am: 7d4de3b1fc  -s ours

Change-Id: I74870eb7a45cc10534d9f154a70dab01cab72a6a
tree: c8230ac21f6b54ad585337348a422a68a41b82eb
  1. devicetree/
  2. net/
  3. Android.bp