[automerger skipped] Merge "Migrate from android::String isEmpty to empty" into main am: efce371535 -s ours am: e82589512b -s ours am: 7e82853f81 -s ours am: 1d83c613e8 -s ours am: 997ebb8055 -s ours

am skip reason: Merged-In Id74502de0e51182aa9629db8dc70739be4483d12 with SHA-1 a7a9988734 is already in history

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

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