Merge "Controls - Large ranges improperly calculated" into rvc-qpr-dev am: 312e70e191

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12994959

Change-Id: Ie41afb53bc14ae002a0f043ed18fb4725a25a901