[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: d5f612bf am: 99eafec0 -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: I28eda22b6d02917b0777c152f39911f32815b4f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>