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

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