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: I90900bb87159b13b0e479623fb9f088a9271b178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>