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

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

Change-Id: I6e5a3191817909ea4379fe7d90cae67b4d4c7092