Merge "Introduce RescueParty."

diff --cc core/java/android/app/ContextImpl.java
Simple merge

diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
index 75ae43b,58619ab..f99dfed
--- 1/services/core/java/com/android/server/am/ActivityManagerService.java
--- 2/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@@ -340,8 -340,8 +340,9 @@@ import com.android.server.DeviceIdleCon
  import com.android.server.IntentResolver;
  import com.android.server.LocalServices;
  import com.android.server.LockGuard;
+ import com.android.server.RescueParty;
  import com.android.server.ServiceThread;
 +import com.android.server.SystemConfig;
  import com.android.server.SystemService;
  import com.android.server.SystemServiceManager;
  import com.android.server.Watchdog;