Merge changes from topic "apexdenrollback"

* changes:
  Snapshot and restore DE(user) apex data.
  Snapshot and restore CE apex data directories.
diff --git a/tests/src/com/android/tests/apex/AdbdHostTest.java b/tests/src/com/android/tests/apex/AdbdHostTest.java
index b54a5a5..3f8e948 100644
--- a/tests/src/com/android/tests/apex/AdbdHostTest.java
+++ b/tests/src/com/android/tests/apex/AdbdHostTest.java
@@ -22,6 +22,7 @@
 import com.android.tradefed.device.IManagedTestDevice;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -31,6 +32,7 @@
  * Test to check if Apex can be staged, activated and uninstalled successfully.
  */
 @RunWith(DeviceJUnit4ClassRunner.class)
+@Ignore // TODO(b/148759193): remove when test is fixed
 public class AdbdHostTest extends ApexE2EBaseHostTest {
 
     /**