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

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



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