[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 497d4830a3 -s ours

am skip reason: Merged-In Ifd63a964bc66c615d151877abbf06c1eeef0fc63 with SHA-1 1c2342b48e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libhevc/+/19094609

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