[automerger skipped] Merge "Rename featureId -> attributionTag" into rvc-dev am: da8418c0fd am: 021cd91fb5 am: f8e6e7c722 am: 4995934187 -s ours

am skip reason: Change-Id Ic56606795e5e68ba76794198faf496eec6d87cd0 with SHA-1 73d9f7833d is in history

Change-Id: Ic9e2bc16f760e310bdf7e920137acd1c60f65171