diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index f5592fa7e4079..7b8dc52bc3b44 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -240,7 +240,9 @@ public class VectorDrawable extends Drawable {
      * constructors to set the state and initialize local properties.
      */
     private VectorDrawable(@NonNull VectorDrawableState state, @Nullable Resources res) {
-        mVectorState = state;
+        // Constant state sharing is disabled until we fix onStateChanged()
+        // affecting the shared bitmap.
+        mVectorState = new VectorDrawableState(state);
         updateLocalState(res);
     }