[automerger skipped] Merge "cameraservice: Migrate all internal...

[automerger skipped] Merge "cameraservice: Migrate all internal String8/String16s to std::string" into main am: 27a48b7e am: 51e7bc8d -s ours am: eb7bbe02 -s ours

am skip reason: Merged-In I59330ac03c8a52b6c21a2388bba0c143e68af4cf with SHA-1 71d8f67c is already in history

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



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