Merge changes from topics "quantizer_improved_logic", "reintroduce_scaling_fixes" into sc-dev am: e0970984 am: dc4c3fbc

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

Change-Id: I3e9c4b05b1e9c60d6df515e59b5670563c190fcb