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

[automerger skipped] Merge "cameraservice: Migrate all internal String8/String16s to std::string" into udc-qpr-dev-plus-aosp am: 0b822b8b -s ours

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

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



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