[automerger skipped] Merge "Rename featureId -> attributionTag" into rvc-dev...
[automerger skipped] Merge "Rename featureId -> attributionTag" into rvc-dev am: fcc9ff00 am: 5462cc69 -s ours
am skip reason: Change-Id I27155d8638f0e1dea5d021ac3ff88f9db09c9936 with SHA-1 8b31fdb2 is in history
Change-Id: If3dc8d6e7cd96dbf8d665b12b4c00114ace9d834