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

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

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



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