Merge "Adjust with changes in libxml2 upgrade" into main am: da32cbba40

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2772645

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