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

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

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