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

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

Change-Id: Iae8390aca8aa53e758e3b82ef4f192bb19b483fe