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

Change-Id: I4fd2e80bfe6bf1bb446f1aed8e02bf9acedcdefd