Merge "Fix -Winteger-overflow warning" into main am: 34714bfb95

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2863362

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