Merge "Heif decoder: remove redundant include" am: daa6d22d am: 1b6148e6...

Merge "Heif decoder: remove redundant include" am: daa6d22d am: 1b6148e6 am: 816915a1 am: 71332acd am: f990d957

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2501135



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