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

[automerger skipped] Merge "Camera: Generate tombstone when watchdog bites" into tm-dev am: c6412e78 am: 8782935c -s ours

am skip reason: Merged-In I11254e04d9d883e839dc1a7eee309e249613957e with SHA-1 620763ff is already in history

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



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