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

[automerger skipped] Merge "cameraservice: Migrate all internal String8/String16s to std::string" into udc-dev-plus-aosp am: 29af5ad2 am: 7da866cb -s ours

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

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



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