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

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

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

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