Merge "SilkFX: fix gainmap metadata editor size" into udc-dev am: d33c5e3d am: b132d7d8

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



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