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

[automerger skipped] Merge "cameraservice: Migrate all internal String8/String16s to std::string" into main am: ef312206 am: 74713f0e -s ours am: e8993caf -s ours

am skip reason: Merged-In I7aee6696f149244c643ec1399815155f3f562538 with SHA-1 f43da6e8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2706302



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