Merge changes from topic "am-052d63f52c03415992131e8d017ee02c" into main

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