Merge "Rename featureId -> attributionTag" into rvc-dev-plus-aosp