Merge "Requantize by resolution / 8" into rvc-dev am: 5e520a5a8e am: 908adc640d am: 35df12af60 am: 7bc793f7c7

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

Change-Id: I5d16e189356438c63a079d9969e07cfef77c9fbc