Merge "Modify attribution tests for new trusted chaining logic" into stage-aosp-sc-ts-dev