Merge "Merge "Add aborted start result." into oc-dev am: 8796c20dae am: 0259473b75" into oc-dr1-dev-plus-aosp