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

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