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

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

Change-Id: I147f21112a18502345a123f93418dc4d047b0da6