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

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

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