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

Change-Id: I8361a38d9a913072541e805176bfccdc728f333c