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: If21f8ec54c6fac23cd32f17696ea301f10696d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>