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

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

am skip reason: subject contains skip directive

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



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