Merge "Add error/cause code reporting for Non A/B OTA failures" am: 2db2f6d265 am: c2a0d6776c am: 1b0da0cdfd
am: f2e1a43ac5

Change-Id: I45210f7127b92a68b419f5b8248d090d0607e716