DO NOT MERGE Prevent OOM death for services under ServiceWatcher's care.

Change-Id: If87be5769b55368edaf4776189e8f6e51a21eb03

Conflicts:

	services/java/com/android/server/ServiceWatcher.java
1 file changed