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

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

Change-Id: I18b1a14166b289c5112bd0a1dd517095db15b30b