Assemble proxy chain based on package/uid, not attribution tag

Some proxy usages, in future, may not have matching attribution tags.
Match on package name and uid instead.

Bug: 183402046
Test: Manual
Change-Id: If122f13fb1d20bfe0bad415235f2143d41339650