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

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