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: df271348 am: 992c9367

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



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