[automerger skipped] Merge "Specify type when calling ConsumeIntegralInRange"...

[automerger skipped] Merge "Specify type when calling ConsumeIntegralInRange" am: c9f73f28 am: eedaa545 am: 84583feb am: 45e46e81 am: b877c8d2 -s ours

am skip reason: Merged-In I185438c8440b6d547222a3c9872d33a71c9ac2c7 with SHA-1 96aed5f8 is already in history

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

Change-Id: I5497f99a1f50fa877848a59e584baaed78f6a930