Merge "Specify type when calling ConsumeIntegralInRange" am: c9f73f28dd am: eedaa545f7 am: 84583febb9

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

Change-Id: I9f8c6a969baf5e264b98899018d27153f1c88496