[automerger skipped] Merge "[RESTRICT AUTOMERGE] cameraserver: Add watchdog...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] cameraserver: Add watchdog timer for disconnect." into tm-d1-dev am: b7a86ae0 am: 197c0f6d am: 2165b1b8 -s ours

am skip reason: subject contains skip directive

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



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