Merge "healthd: add annotations for dumpsys diagnostics" into main