[automerger] Simplifying some package matching code by using common itemInfo mathcher am: 6e13dd3aa8

Change-Id: I1585b0977b6df998de571de1285c4b2b3b0a7550