[automerger skipped] Merge "cameraserver: Set abort message for watchdog" into...

[automerger skipped] Merge "cameraserver: Set abort message for watchdog" into udc-dev am: 04491e1d am: 77d3e318 -s ours am: a6522a16 -s ours

am skip reason: Merged-In Iee80988d41595d3fb8479bb3f41031e35578506f with SHA-1 3c78274b is already in history

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



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