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

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

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