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: I53d14bd9e3f02b5ae467a8607229144614692b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>