Merge changes I6387c999,I470e5c6e into main

* changes:
  Update illustrations in Private Space setup & settings
  Replace autoadvance screens with waiting screen in PS setup

src/com/android/settings/privatespace/PrivateSpaceMaintainer.java

@@ -83,7 +83,7 @@ public class PrivateSpaceMaintainer {
      *
      * <p> This method should be used by the Private Space Setup Flow ONLY.
      */
-    @VisibleForTesting
+    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     public final synchronized boolean createPrivateSpace() {
         if (!Flags.allowPrivateProfile()
                 || !android.multiuser.Flags.enablePrivateSpaceFeatures()) {