Merge "SilkFX: add gainmap metadata testing" into udc-dev am: f5f517a2 am: 1c6c2779 am: e02e8d9a am: 83d25f1c

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



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