Merge "[installd] Improve profile merging error logging" am: 781e508fcd am: a8fdc6c6ec
am: 000b73f1c6

Change-Id: I0c2cb331fdb0f70f593907f65a636b19c66d09d0