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

Change-Id: I655b21e38e112eccb50605b4e27c1855061e4e48