Merge "Adjust with changes in libxml2 upgrade" into main am: 6d755ae318

Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/2789752

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