Merge "Merge "Keep detailed job-ended reasons in the history ring" into pi-dev am: 05a033fa7b" into pi-dev-plus-aosp