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 am: 2436cdc3

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



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