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

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

Change-Id: I879e9ab8ba6409db065026fe1ecee7aa1d229448