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

[automerger skipped] Merge "Camera: Generate tombstone when watchdog bites" into tm-dev am: c6412e78 -s ours am: dcca821e -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: If1c536bc34685f43becb20e31da8ac92e5a0db39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>