[automerger skipped] Merge "Camera: Generate tombstone when watchdog bites"...

[automerger skipped] Merge "Camera: Generate tombstone when watchdog bites" into tm-dev am: c6412e78 am: da257272 -s ours am: 99889e54 -s ours am: b2a3bfe9 -s ours

am skip reason: Merged-In I11254e04d9d883e839dc1a7eee309e249613957e with SHA-1 48162a77 is already in history

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



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