Merge "Fix the issue of using SilkFx crash on non-HDR-supported phone." into udc-dev am: 9cdcda8d45 am: 7fef0a1708 am: d7bef8c8b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23395745 Change-Id: I1bfc6c2cc63b55f7595e461897eda6a98c2793cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: