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

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

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