[automerger skipped] Merge "Rename featureId -> attributionTag" into rvc-dev am: da8418c0fd -s ours

am skip reason: Change-Id Ic56606795e5e68ba76794198faf496eec6d87cd0 with SHA-1 3f6efd8315 is in history

Change-Id: I119978c19e3e1903c653cad97d49b19038cf28b0