[automerger skipped] Merge "Create an empty String8 to cause the first...

[automerger skipped] Merge "Create an empty String8 to cause the first allocation" into tm-dev am: f325d393 am: 91e93d7d am: e5ed8a3c -s ours am: bfcd8025 -s ours am: 834af26b -s ours

am skip reason: Merged-In Idda3065796a23d0f0ec0a79dad34e2eeb554fe38 with SHA-1 a39f3dbb is already in history

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



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