[automerger skipped] Merge "Revert "healthd: add stem to health@2.0-service.override [DO NOT MERGE]"" into pi-dev am: ee81388edb
am: b530492ccd  -s ours

Change-Id: I3cdcef63da0fb0f58ba69926260ab24971fcb879