Snap for 4517567 from 716fbfb605a6dbd45c754e5ceb224310b7faf162 to pi-release

Change-Id: I7188ebdeef95f2691ac37b86d1880f6bad146c80
diff --git a/common/robolectric/android-all/android-all-stubs.jar b/common/robolectric/android-all/android-all-stubs.jar
index 76ada97..77f4a42 100644
--- a/common/robolectric/android-all/android-all-stubs.jar
+++ b/common/robolectric/android-all/android-all-stubs.jar
Binary files differ
diff --git a/common/robolectric/android-all/android-all-stubs_removed_classes.txt b/common/robolectric/android-all/android-all-stubs_removed_classes.txt
new file mode 100644
index 0000000..ef5f6c6
--- /dev/null
+++ b/common/robolectric/android-all/android-all-stubs_removed_classes.txt
@@ -0,0 +1,165 @@
+com/android/server/backup/AccountManagerBackupHelper.class
+com/android/server/backup/AccountSyncSettingsBackupHelper.class
+com/android/server/backup/BackupManagerConstants.class
+com/android/server/backup/BackupManagerService$1.class
+com/android/server/backup/BackupManagerService$2.class
+com/android/server/backup/BackupManagerService$3.class
+com/android/server/backup/BackupManagerService$4.class
+com/android/server/backup/BackupManagerService$5.class
+com/android/server/backup/BackupManagerService$6.class
+com/android/server/backup/BackupManagerService$7.class
+com/android/server/backup/BackupManagerService$8.class
+com/android/server/backup/BackupManagerService$9.class
+com/android/server/backup/BackupManagerService$ActiveRestoreSession.class
+com/android/server/backup/BackupManagerService$ActiveRestoreSession$EndRestoreRunnable.class
+com/android/server/backup/BackupManagerService$AdbBackupParams.class
+com/android/server/backup/BackupManagerService$AdbParams.class
+com/android/server/backup/BackupManagerService$AdbRestoreFinishedLatch.class
+com/android/server/backup/BackupManagerService$AdbRestoreParams.class
+com/android/server/backup/BackupManagerService$BackupHandler.class
+com/android/server/backup/BackupManagerService$BackupParams.class
+com/android/server/backup/BackupManagerService$BackupRequest.class
+com/android/server/backup/BackupManagerService$BackupState.class
+com/android/server/backup/BackupManagerService.class
+com/android/server/backup/BackupManagerService$ClearDataObserver.class
+com/android/server/backup/BackupManagerService$ClearParams.class
+com/android/server/backup/BackupManagerService$ClearRetryParams.class
+com/android/server/backup/BackupManagerService$FullBackupEngine.class
+com/android/server/backup/BackupManagerService$FullBackupEngine$FullBackupRunner.class
+com/android/server/backup/BackupManagerService$FullBackupEntry.class
+com/android/server/backup/BackupManagerService$FullBackupObbConnection.class
+com/android/server/backup/BackupManagerService$FullBackupPreflight.class
+com/android/server/backup/BackupManagerService$FullBackupTask.class
+com/android/server/backup/BackupManagerService$FullRestoreEngine.class
+com/android/server/backup/BackupManagerService$FullRestoreEngine$RestoreDeleteObserver.class
+com/android/server/backup/BackupManagerService$FullRestoreEngine$RestoreFileRunnable.class
+com/android/server/backup/BackupManagerService$FullRestoreEngine$RestoreInstallObserver.class
+com/android/server/backup/BackupManagerServiceInterface.class
+com/android/server/backup/BackupManagerService$Lifecycle.class
+com/android/server/backup/BackupManagerService$Operation.class
+com/android/server/backup/BackupManagerService$PerformAdbBackupTask.class
+com/android/server/backup/BackupManagerService$PerformAdbRestoreTask.class
+com/android/server/backup/BackupManagerService$PerformAdbRestoreTask$RestoreDeleteObserver.class
+com/android/server/backup/BackupManagerService$PerformAdbRestoreTask$RestoreFileRunnable.class
+com/android/server/backup/BackupManagerService$PerformAdbRestoreTask$RestoreFinishedRunnable.class
+com/android/server/backup/BackupManagerService$PerformAdbRestoreTask$RestoreInstallObserver.class
+com/android/server/backup/BackupManagerService$PerformBackupTask.class
+com/android/server/backup/BackupManagerService$PerformClearTask.class
+com/android/server/backup/BackupManagerService$PerformFullTransportBackupTask.class
+com/android/server/backup/BackupManagerService$PerformFullTransportBackupTask$SinglePackageBackupPreflight.class
+com/android/server/backup/BackupManagerService$PerformFullTransportBackupTask$SinglePackageBackupRunner.class
+com/android/server/backup/BackupManagerService$PerformInitializeTask.class
+com/android/server/backup/BackupManagerService$PerformUnifiedRestoreTask.class
+com/android/server/backup/BackupManagerService$PerformUnifiedRestoreTask$EngineThread.class
+com/android/server/backup/BackupManagerService$PerformUnifiedRestoreTask$StreamFeederThread.class
+com/android/server/backup/BackupManagerService$ProvisionedObserver.class
+com/android/server/backup/BackupManagerService$RestoreEngine.class
+com/android/server/backup/BackupManagerService$RestoreGetSetsParams.class
+com/android/server/backup/BackupManagerService$RestoreParams.class
+com/android/server/backup/BackupManagerService$RestorePolicy.class
+com/android/server/backup/BackupManagerService$RunBackupReceiver.class
+com/android/server/backup/BackupManagerService$RunInitializeReceiver.class
+com/android/server/backup/BackupManagerService$UnifiedRestoreState.class
+com/android/server/backup/BackupPasswordManager$1.class
+com/android/server/backup/BackupPasswordManager$BackupPasswordHash.class
+com/android/server/backup/BackupPasswordManager.class
+com/android/server/backup/BackupPasswordManager$PasswordHashFileCodec.class
+com/android/server/backup/BackupPasswordManager$PasswordVersionFileCodec.class
+com/android/server/backup/BackupRestoreTask.class
+com/android/server/backup/BackupUtils.class
+com/android/server/backup/DataChangedJournal.class
+com/android/server/backup/DataChangedJournal$Consumer.class
+com/android/server/backup/FileMetadata.class
+com/android/server/backup/fullbackup/FullBackupEngine.class
+com/android/server/backup/fullbackup/FullBackupEngine$FullBackupRunner.class
+com/android/server/backup/fullbackup/FullBackupEntry.class
+com/android/server/backup/fullbackup/FullBackupObbConnection.class
+com/android/server/backup/fullbackup/FullBackupPreflight.class
+com/android/server/backup/fullbackup/FullBackupTask.class
+com/android/server/backup/FullBackupJob.class
+com/android/server/backup/fullbackup/PerformAdbBackupTask.class
+com/android/server/backup/fullbackup/PerformFullTransportBackupTask.class
+com/android/server/backup/fullbackup/PerformFullTransportBackupTask$SinglePackageBackupPreflight.class
+com/android/server/backup/fullbackup/PerformFullTransportBackupTask$SinglePackageBackupRunner.class
+com/android/server/backup/internal/BackupHandler.class
+com/android/server/backup/internal/BackupRequest.class
+com/android/server/backup/internal/BackupState.class
+com/android/server/backup/internal/ClearDataObserver.class
+com/android/server/backup/internal/Operation.class
+com/android/server/backup/internal/PerformBackupTask$1.class
+com/android/server/backup/internal/PerformBackupTask.class
+com/android/server/backup/internal/PerformClearTask.class
+com/android/server/backup/internal/PerformInitializeTask.class
+com/android/server/backup/internal/ProvisionedObserver.class
+com/android/server/backup/internal/RunBackupReceiver.class
+com/android/server/backup/internal/RunInitializeReceiver.class
+com/android/server/backup/KeyValueAdbBackupEngine.class
+com/android/server/backup/KeyValueAdbBackupEngine$KeyValueAdbBackupDataCopier.class
+com/android/server/backup/KeyValueAdbRestoreEngine.class
+com/android/server/backup/KeyValueBackupJob.class
+com/android/server/backup/NotificationBackupHelper.class
+com/android/server/backup/PackageManagerBackupAgent.class
+com/android/server/backup/PackageManagerBackupAgent$Metadata.class
+com/android/server/backup/params/AdbBackupParams.class
+com/android/server/backup/params/AdbParams.class
+com/android/server/backup/params/AdbRestoreParams.class
+com/android/server/backup/params/BackupParams.class
+com/android/server/backup/params/ClearParams.class
+com/android/server/backup/params/ClearRetryParams.class
+com/android/server/backup/params/RestoreGetSetsParams.class
+com/android/server/backup/params/RestoreParams.class
+com/android/server/backup/PermissionBackupHelper.class
+com/android/server/backup/PreferredActivityBackupHelper.class
+com/android/server/backup/ProcessedPackagesJournal.class
+com/android/server/backup/RefactoredBackupManagerService$1.class
+com/android/server/backup/RefactoredBackupManagerService$2.class
+com/android/server/backup/RefactoredBackupManagerService$3.class
+com/android/server/backup/RefactoredBackupManagerService$4.class
+com/android/server/backup/RefactoredBackupManagerService$5.class
+com/android/server/backup/RefactoredBackupManagerService$6.class
+com/android/server/backup/RefactoredBackupManagerService$7.class
+com/android/server/backup/RefactoredBackupManagerService$8.class
+com/android/server/backup/RefactoredBackupManagerService.class
+com/android/server/backup/RefactoredBackupManagerService$Lifecycle.class
+com/android/server/backup/restore/ActiveRestoreSession.class
+com/android/server/backup/restore/ActiveRestoreSession$EndRestoreRunnable.class
+com/android/server/backup/restore/AdbRestoreFinishedLatch.class
+com/android/server/backup/restore/FullRestoreEngine$1.class
+com/android/server/backup/restore/FullRestoreEngine$2.class
+com/android/server/backup/restore/FullRestoreEngine.class
+com/android/server/backup/restore/PerformAdbRestoreTask$1.class
+com/android/server/backup/restore/PerformAdbRestoreTask$2.class
+com/android/server/backup/restore/PerformAdbRestoreTask.class
+com/android/server/backup/restore/PerformAdbRestoreTask$RestoreFinishedRunnable.class
+com/android/server/backup/restore/PerformUnifiedRestoreTask$1.class
+com/android/server/backup/restore/PerformUnifiedRestoreTask.class
+com/android/server/backup/restore/PerformUnifiedRestoreTask$EngineThread.class
+com/android/server/backup/restore/PerformUnifiedRestoreTask$StreamFeederThread.class
+com/android/server/backup/restore/RestoreDeleteObserver.class
+com/android/server/backup/restore/RestoreEngine.class
+com/android/server/backup/restore/RestoreFileRunnable.class
+com/android/server/backup/restore/RestoreInstallObserver.class
+com/android/server/backup/restore/RestorePolicy.class
+com/android/server/backup/restore/UnifiedRestoreState.class
+com/android/server/backup/ShortcutBackupHelper.class
+com/android/server/backup/SystemBackupAgent.class
+com/android/server/backup/Trampoline.class
+com/android/server/backup/TransportManager$1.class
+com/android/server/backup/TransportManager.class
+com/android/server/backup/TransportManager$RebindOnTimeoutHandler.class
+com/android/server/backup/TransportManager$TransportBoundListener.class
+com/android/server/backup/TransportManager$TransportConnection.class
+com/android/server/backup/TransportManager$TransportReadyCallback.class
+com/android/server/backup/UsageStatsBackupHelper.class
+com/android/server/backup/utils/AppBackupUtils.class
+com/android/server/backup/utils/BackupManagerMonitorUtils.class
+com/android/server/backup/utils/BackupObserverUtils.class
+com/android/server/backup/utils/BytesReadListener.class
+com/android/server/backup/utils/DataStreamCodec.class
+com/android/server/backup/utils/DataStreamFileCodec.class
+com/android/server/backup/utils/FullBackupRestoreObserverUtils.class
+com/android/server/backup/utils/FullBackupUtils.class
+com/android/server/backup/utils/PasswordUtils.class
+com/android/server/backup/utils/RestoreUtils.class
+com/android/server/backup/utils/SparseArrayUtils.class
+com/android/server/backup/utils/TarBackupReader.class