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

Change-Id: I967edc50dff44d830e475b94678c0194a379dba1