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

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

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



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