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

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

Change-Id: I9dd4287e6d2c3f869a04328d488de3c30289f398