[automerger skipped] [RESTRICT AUTOMERGE] cameraserver: Add watchdog timer for...

[automerger skipped] [RESTRICT AUTOMERGE] cameraserver: Add watchdog timer for disconnect. am: 48162a77 am: ff0935e4 am: b43ff095 -s ours

am skip reason: subject contains skip directive

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



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