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

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

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