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