Merge "cameraserver: Set abort message for watchdog" into udc-dev am: 04491e1d

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



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