Merge "Removed extra string instance creation" am: 3cb50d840f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2337144

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