tree f8a54f6d3d1a147e4d9074a5918ae0becf318511
parent 0f6bde0ee40de32e404d5c7882fe8c8aa47de0a3
author Calin Juravle <calin@google.com> 1573526595 -0800
committer Calin Juravle <calin@google.com> 1573605200 +0000

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