am f355f978: am efcc2ca6: Merge "Fix issue #11223338: Not retaining service started state while restarting" into klp-dev

* commit 'f355f978782fa1a0437fa62f29d90cd27ddabf70':
  Fix issue #11223338: Not retaining service started state while restarting