Merge "cameraserver: Exit watchdog for disconnect call" into tm-d1-dev am: 46c7315c

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



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