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

Change-Id: If490f9d9a558a2775526d847081ac1b32f59d805