[automerger skipped] Merge "Fix stack-use-after-scope for a `std::string`" am: 165a7640 am: 9f339eb2 am: bd08d0e3 -s ours

am skip reason: Merged-In Iea71a5cc84b7dfa96e7dcb549435f8394770a4df with SHA-1 eb39a511 is already in history

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



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