[automerger skipped] Merge "Rename featureId -> attributionTag" into rvc-dev-plus-aosp am: b5ccedfe am: c456fee0 am: 69f5ab79 -s ours
am skip reason: Change-Id I2a2245fe76e09e62cb13d5785d2efb4a304ba54a with SHA-1 8a06c287 is in history
Change-Id: I961748e6d50d170dac0891136bd02e2351cbf9ee