[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: f508c3728d -s ours am: 20f7640553 -s ours

am skip reason: Merged-In I8d00346e706ffd8004e4fbc2013ad9ad6ca40876 with SHA-1 33a089c661 is already in history

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

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