Merge "Avoid implicit type conversion between signed/unsigned" am: ae8cd55440

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

Change-Id: I9905a6d79e5faf805633accc2652dc5005432930