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

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

Change-Id: I63dfd785beaa3c24418bf1dbfb7cae504f7b8972