Merge "Fix an arithmetic error when using unsigned" am: 5e053bba

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2411296



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