Merge changes from topic "icmpv6-forwarding-test" am: b184849385

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1821973

Change-Id: I10efd16f066f0bbf19066984e7e4a3bdde8b005a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: c833cc7944096a432cce465f8f0dcc45fc402b98
  1. staticlibs/