Merge "Make RescueParty call vold directly" into qt-dev

am: 2618371aa5

Change-Id: Id4b104e811a30722ea3c70add3750a9319245ff5

diff --cc core/java/android/os/RecoverySystem.java
index 8938ddd,53298d8..48fc2a6
--- 1/core/java/android/os/RecoverySystem.java
--- 2/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@@ -30,10 -30,7 +30,9 @@@ import android.content.Context
  import android.content.Intent;
  import android.content.IntentFilter;
  import android.content.pm.PackageManager;
- import android.os.storage.IStorageManager;
  import android.provider.Settings;
 +import android.telephony.SubscriptionInfo;
 +import android.telephony.SubscriptionManager;
  import android.telephony.euicc.EuiccManager;
  import android.text.TextUtils;
  import android.text.format.DateFormat;