Merge "Fix unwanted sign-extention when converting byte -> int" am: dc59956478 am: ebf3f814e8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1993170

Change-Id: Ibefe1575a977c1e6b990f3553e6c10a5d2a32162