Merge "fix integer promotion in logging." am: 27174df9 am: 8ff46966 am:...

Merge "fix integer promotion in logging." am: 27174df9 am: 8ff46966 am: 0e9db4a7 am: 21dcb37a

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

Change-Id: I596190e48f3a43ba4f588f43b673813fa32f920a