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

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



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