Merge "Fix the issue of using SilkFx crash on non-HDR-supported phone." into...

Merge "Fix the issue of using SilkFx crash on non-HDR-supported phone." into udc-dev am: 9cdcda8d am: 7fef0a17 am: d7bef8c8 am: 3cc9cd01

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



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