am c2f9e432: am 68025995: am 1942f8a7: am d4ef34ce: am 512141d5: Merge "Respect DONT_KILL_APP flag when bringing down a disabled service." into mnc-dev

* commit 'c2f9e4323cda3090cfa9197eb402f9279a72b224':
  Respect DONT_KILL_APP flag when bringing down a disabled service.