Merge "fix long overflow when enable DEBUG_ACCELERATION" am: 0bd3275a71 am: 4fbb9e0055

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

Change-Id: I86d43d75490ddf27408fa03c18eacdbb37a4a945