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

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



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