[automerger skipped] Merge "healthd: add stem to health@2.0-service.override [DO NOT MERGE]" into pi-dev am: 95d314be38 skipped: 42389108f6

Change-Id: I3fcdfae04fd4c21d0f38c54d13aa07c2fc654092