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

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

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



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