Merge "Upgrade expat to R_2_5_0" am: 771d7033f1

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

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