[automerger skipped] Merge "Adding host version of net_flags_lib" into main am: cb14e21808 am: 2efd2a1848 -s ours

am skip reason: Merged-In Ieabd7ea363dbae5a1d0f65fb74f484a04a845ea7 with SHA-1 26d58e1533 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3199743

Change-Id: I5210f900603cb315a22f8822235e15d1e48a6264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>