Merge changes from topic "rro-cts"

* changes:
  RRO CTS Test APIs
  Relax restrictions on non-system overlays

diff --cc api/test-current.txt
Simple merge

diff --cc core/java/android/content/res/AssetManager.java
Simple merge

diff --cc core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java
index c133469,8fed19e..99b6421
--- 1/core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java
--- 2/core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java
+++ b/core/tests/overlaytests/host/src/com/android/server/om/hosttest/InstallOverlayTests.java
@@@ -155,17 -155,9 +155,17 @@@ public class InstallOverlayTests extend
          }
      }
  
 +    @Test
 +    public void instantAppsNotVisibleToOMS() throws Exception {
 +        installInstantPackage("OverlayHostTests_AppOverlayV1.apk");
 +        assertFalse(overlayManagerContainsPackage(APP_OVERLAY_PACKAGE_NAME));
 +        installConvertExistingInstantPackageToFull(APP_OVERLAY_PACKAGE_NAME);
 +        assertTrue(overlayManagerContainsPackage(APP_OVERLAY_PACKAGE_NAME));
 +    }
 +
      private void delay() {
          try {
-             Thread.sleep(100);
+             Thread.sleep(1000);
          } catch (InterruptedException e) {
          }
      }

diff --cc services/core/java/com/android/server/pm/PackageManagerService.java
Simple merge