Handle profile annotation during profman-merge

When merging via profman we need to consider the presence of annotations
during data filtering. The profile key contains more than just the file
name, and as such it needs some processing when compared to the apk
locations.

Test: profile_assistant_test
Bug: 139884006
Change-Id: Ic35814f7e2eebfa9b92126b9d527159754412d9a
3 files changed