[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: 69deaace am: 4d2ca199 -s ours am: 830246b6 -s ours

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

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



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