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

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

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