Merge "Capture additional information about packages" into nougat-cts-dev
am: 2aa04cfdbc

Change-Id: I5d75eba3b1cf873ec906dd6ccbae5599de2d8009