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

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



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