Merge "Minor shuffling of installd error reporting." am: 991707a167 am: 405dbf06b5 am: 18148ac756
am: bbb06f3b6a

Change-Id: Ifd2d7c59b6698d2c6dfb35e1a99aa51df4bce9df