Merge "Prevent more integer overflows" into sc-dev am: 6421e6b8b8 am: e2fee4b62c

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

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