Merge "SilkFX: add gainmap metadata testing" into udc-dev am: f5f517a2 am:...

Merge "SilkFX: add gainmap metadata testing" into udc-dev am: f5f517a2 am: 87d76fcb am: f962a1bd

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



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