Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce9592378

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2725659

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