[automerger skipped] Merge "Rename featureId -> attributionTag" into rvc-dev-plus-aosp am: f1d4e236 am: 9b122c8f am: 593c4c74 -s ours
am skip reason: Change-Id Ic56606795e5e68ba76794198faf496eec6d87cd0 with SHA-1 90eb7ecc is in history
Change-Id: I39ec876b57361aa8622bc3c7a9e88bf0a9b127fe