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

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

Change-Id: I49d737aded60bc4dc7e9f922b9142b09d18eaaaa