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

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

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



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