Merge "Merge "Preserve failure history when calling startObservingHealth" into rvc-dev am: da41b0a2 am: 71a5cf16" into rvc-d1-dev-plus-aosp