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

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

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