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

Change-Id: I962f70134cac7dd83f0cacfcc21d75afe964b875