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