Propagate original Resources to DrawableContainer if no override set

Also fixes a double-add in ASLD.

Bug: 19498949
Change-Id: I9e7e0a0fb22a23518c80c1b099f8da0e0c1f53d8

graphics/java/android/graphics/drawable/DrawableContainer.java

@@ -685,7 +685,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
         DrawableContainerState(DrawableContainerState orig, DrawableContainer owner,
                 Resources res) {
             mOwner = owner;
-            mRes = res;
+            mRes = res != null ? res : orig != null ? orig.mRes : null;
 
             if (orig != null) {
                 mChangingConfigurations = orig.mChangingConfigurations;