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

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

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



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