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: f346da37 am: 411b6b68 am: 052b0d14

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



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