[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into...

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

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



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