Merge "Upgrade expat to R_2_4_1" am: efc6e91310 am: 6f15ac2ae7

Original change: https://android-review.googlesource.com/c/platform/external/expat/+/1792771

Change-Id: I9fb85428232050a7c111092313d5e740798369a6