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

Merge "Adjust with changes in libxml2 upgrade" into main am: da32cbba am: ce9fbaca am: 966addac

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



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