Merge "Fix race condition in extension string creation" into main am: 5959d52278 am: 5ac4647aa9

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

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