Merge "Merge "Do not turn on dithering by default" into sc-dev am: 98177904...

Merge "Merge "Do not turn on dithering by default" into sc-dev am: 98177904 am: 81dd9d0c am: 5b84b29d" into sc-v2-dev-plus-aosp am: 5f32b598

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

Change-Id: I719a4aeeb0d9d1cc165e85ca0609acde15efd3f8