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