[automerger skipped] Merge "Camera: Remove tid and pid from abort message"...

[automerger skipped] Merge "Camera: Remove tid and pid from abort message" into udc-dev am: d6e59e88 am: 73def748 -s ours am: c6f29905 -s ours

am skip reason: Merged-In I0d6d11544caf68353afdbf4aa6ba6bfa086b36d4 with SHA-1 6245591a is already in history

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



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