Merge "Allow comparison against multi serial nums for A/B package"
am: 3810046a55

Change-Id: Ic9e431b0d31c61484b04ce4f491a584b3eeba09c