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

[automerger skipped] Merge "Merge "cameraserver: Set abort message for watchdog" into udc-dev am: 04491e1d am: d646da13" into udc-d1-dev-plus-aosp am: 999d4cff -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: Ib42192c2c46d33b49880b801f6d36a38975d9f5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>