[automerger skipped] Merge "Add CameraService Watchdog" into tm-dev am:...

[automerger skipped] Merge "Add CameraService Watchdog" into tm-dev am: d2085a9b am: 210aad7f -s ours am: 865a7f74 -s ours

am skip reason: Merged-In Ia7b4a3fd9395210800a391c62b4ea757efbb3b00 with SHA-1 98ffa75d is already in history

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



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