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: cf89c2e2

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



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