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

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

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