Merge "PersistableBundle.restoreFromXml should return a mutable bundle." am: ffb1899ba2 am: c13f8d0fe7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1679293

Change-Id: I96b86027bb82fbff281d129f06f159df4dc2904e

core/java/android/os/PersistableBundle.java

@@ -316,7 +316,7 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa
                         new MyReadMapCallback()));
             }
         }
-        return EMPTY;
+        return new PersistableBundle();  // An empty mutable PersistableBundle
     }
 
     @Override