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

Change-Id: I60ec7962ea1948c654fafa98abaebe3b4c66cd04