Merge "Take string by const reference" am: c3ca804957

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1709848

Change-Id: I8e9f3179abdff3a1c83bf4de2eab7b258c11f345