Merge "Migrate from android::String isEmpty to empty" into udc-dev-plus-aosp