[automerger skipped] Merge "Rename featureId -> attributionTag" into rvc-dev am: d7a823623f -s ours am: 154c6a0f36 -s ours am: bbbdce46ab -s ours
am skip reason: Change-Id I2a2245fe76e09e62cb13d5785d2efb4a304ba54a with SHA-1 aea50fc06a is in history
Change-Id: Ia86fbb364d851a06eb9592818a635f7e1111bfc5
This commit is contained in: