[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: d5d62f7ef1 -s ours am: 98bfe0bb97 -s ours am: 1074f3b90f -s ours

am skip reason: Merged-In I69970a4bd5f6cbe5064b0be447ffcc8892e875a4 with SHA-1 2473c05ce2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/oss-fuzz/+/19094689

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