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 am: d408fd48

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



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