Merge "fix integer promotion in logging." am: 27174df9cc am: 8ff469661b

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

Change-Id: I9c29916532761fe6632384d9f3e8eed14717ad69