[automerger skipped] Merge "Populate error message in case APK part of staged install fails" am: d4897217 am: f4cde669 -s ours am: 5dbfff50 -s ours am: 39254172 -s ours am: 31ac2c89 -s ours
am skip reason: Change-Id I3fa3dfdf9f920f870f07d55782944043e1afbe2a with SHA-1 c2b87a9c is in history

Change-Id: I28151a7636a522e6803af23c98d91367bcdeebda