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

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

Change-Id: I8a676c05d4d3bf6c1b82ae3a8dab047bd8bae16c