Merge "Fix an arithmetic error when using unsigned" am: 5e053bba77 am: 43f03d260e

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

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