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: f7476d96 am: a144108f

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



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