[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 2e03192b53 -s ours am: 8480fd4983 -s ours

am skip reason: Merged-In I71fbaf023c661441852a3a3ed18b935fee111fa2 with SHA-1 773b27c234 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libpcap/+/16843687

Change-Id: I8dbfe74c04cb709cdb7e5e144e7d8ee6362d38a4