Merge "fix integer promotion in logging." am: 27174df9cc am: 8ff469661b am: 0e9db4a752 am: 21dcb37a36 am: b46878b9e3

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

Change-Id: I9ca32906ea1175a4de32b823ac3ceab00ade6df1