Merge "Temp fix for overdimming issue in silkFX." into udc-dev am: 314a5746

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



Change-Id: If3c4b066bac6293671c1cf3e160305b27e402a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>