Merge "Installd: Add context to test errors"
am: acbad287a9

Change-Id: I5380e2633542659f5f710a40066b582c067ca2b8