Save and Restore user.home Property

Bug 5498103

Change-Id: Iaaa84f8b1c9da8471729e74e25061394f7944232
diff --git a/tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java b/tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
index d426290..1b221a4 100644
--- a/tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
+++ b/tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
@@ -121,6 +121,7 @@
             private long startTime;
 
             private Locale defaultLocale;
+            private String userHome;
             private String javaIoTmpDir;
 
             @Override
@@ -140,11 +141,13 @@
 
             private void save() {
                 defaultLocale = Locale.getDefault();
+                userHome = System.getProperty("user.home");
                 javaIoTmpDir = System.getProperty("java.io.tmpdir");
             }
 
             private void restore() {
                 Locale.setDefault(defaultLocale);
+                System.setProperty("user.home", userHome);
                 System.setProperty("java.io.tmpdir", javaIoTmpDir);
             }