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

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

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



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