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

Change-Id: I7d7c6360013e75897915b19e3fc61e5fc8df4a31