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

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

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