Merge "Removing a depreceted method: xmlSchemaCleanupTypes" am: 2cae922f95 am: 59f9fc71b0 am: 7bba48b4f9 am: d35a123ec9 am: 0a27aa84ba

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

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