Merge "Merge "Add mSourceDrawableId to copy constructor" into rvc-dev am: 8e32fa537b" into rvc-dev-plus-aosp