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