[automerger skipped] Merge "Rename featureId -> attributionTag" into rvc-dev-plus-aosp am: 6cba6e86 am: f00c5432 am: f7660d8b -s ours
am skip reason: Change-Id I27155d8638f0e1dea5d021ac3ff88f9db09c9936 with SHA-1 5b6368d6 is in history
Change-Id: I373ab65a8e3a28f820973a309d3f10b4816c5e1a