Merge "cameraservice: Check for watchdog initialization before timing...

Merge "cameraservice: Check for watchdog initialization before timing disconnect." into tm-d1-dev am: ee4811eb am: b11ba5b4

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



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